Merge "Pass Message object to webob exception"

Author: Jenkins

glance/api/v1/images.py

@@ -306,7 +306,7 @@ def index(self, req):
         try:
             images = registry.get_images_list(req.context, **params)
         except exception.Invalid as e:
-            raise HTTPBadRequest(explanation="%s" % e)
+            raise HTTPBadRequest(explanation=e.msg, request=req)
 
         return dict(images=images)
 
@@ -353,7 +353,7 @@ def detail(self, req):
                 redact_loc(image, copy_dict=False)
                 self._enforce_read_protected_props(image, req)
         except exception.Invalid as e:
-            raise HTTPBadRequest(explanation="%s" % e)
+            raise HTTPBadRequest(explanation=e.msg, request=req)
         return dict(images=images)
 
     def _get_query_params(self, req):
@@ -713,8 +713,8 @@ def _handle_source(self, req, image_id, image_meta, image_data):
             if location:
                 try:
                     validate_location(req.context, location)
-                except (exception.BadStoreUri) as bse:
-                    raise HTTPBadRequest(explanation=unicode(bse),
+                except exception.BadStoreUri as bse:
+                    raise HTTPBadRequest(explanation=bse.msg,
                                          request=req)
 
                 self._validate_image_for_activation(req, image_id, image_meta)