Merge "Correct reraising of exception"3.0.0.0b2

4 files changed, 4 insertions, 4 deletions

diff --git a/designate/backend/agent_backend/impl_djbdns.py b/designate/backend/agent_backend/impl_djbdns.py
index 5cbdc52b..aa9bee21 100644..100755
--- a/designate/backend/agent_backend/impl_djbdns.py
+++ b/designate/backend/agent_backend/impl_djbdns.py
@@ -79,8 +79,8 @@ def filter_exceptions(fn):
     def wrapper(*a, **kw):
         try:
             return fn(*a, **kw)
-        except exceptions.Backend as e:
-            raise e
+        except exceptions.Backend:
+            raise
         except Exception as e:
             LOG.error(_LE("Unhandled exception %s"), str(e), exc_info=True)
             raise exceptions.Backend(str(e))
diff --git a/designate/backend/agent_backend/impl_knot2.py b/designate/backend/agent_backend/impl_knot2.py
index dbbf31eb..f8835c7e 100644..100755
--- a/designate/backend/agent_backend/impl_knot2.py
+++ b/designate/backend/agent_backend/impl_knot2.py
@@ -141,7 +141,7 @@ class Knot2Backend(base.AgentBackend):
             except Exception as e:
                 self._execute_knotc('conf-abort')
                 LOG.info(_LI("Zone change aborted: %r"), e)
-                raise e
+                raise
             else:
                 self._execute_knotc('conf-commit')
 
diff --git a/designate/backend/impl_dynect.py b/designate/backend/impl_dynect.py
index 2d3ddad9..8233a605 100644..100755
--- a/designate/backend/impl_dynect.py
+++ b/designate/backend/impl_dynect.py
@@ -372,7 +372,7 @@ class DynECTBackend(base.Backend):
                     client.put(url, data=data)
                     break
             else:
-                raise e
+                raise
 
         client.put(url, data={'activate': True})
         client.logout()
diff --git a/designate/objects/recordset.py b/designate/objects/recordset.py
index c2b00fd7..c2b00fd7 100644..100755
--- a/designate/objects/recordset.py
+++ b/designate/objects/recordset.py