Merge "Fix reraise issue"

senlin/api/middleware/trust.py

@@ -52,7 +52,7 @@ class TrustMiddleware(wsgi.Middleware):
             if ex.code == 400:
                 trust = None
             else:
-                raise ex
+                raise
         if not trust:
             # Create a trust if no existing one found
             trust = kc.trust_create(ctx.user, admin_id, ctx.project, ctx.roles)

senlin/common/schema.py

@@ -241,8 +241,8 @@ class String(PropertySchema):
     def resolve(self, value):
         try:
             return str(value)
-        except (TypeError, ValueError) as ex:
-            raise ex
+        except (TypeError, ValueError):
+            raise
 
     def validate(self, value, context=None):
         if not isinstance(value, six.string_types):