Merge pull request #365 from radix/construct-exceptions-with-saner-arguments

construct empty exceptions with no arguments, instead of () and {}

2 files changed, 7 insertions, 4 deletions

diff --git a/kazoo/exceptions.py b/kazoo/exceptions.py
index 6f32b4f..eeefe49 100644
--- a/kazoo/exceptions.py
+++ b/kazoo/exceptions.py
@@ -52,10 +52,7 @@ EXCEPTIONS = defaultdict(_invalid_error_code)
 
 def _zookeeper_exception(code):
     def decorator(klass):
-        def create(*args, **kwargs):
-            return klass(args, kwargs)
-
-        EXCEPTIONS[code] = create
+        EXCEPTIONS[code] = klass
         klass.code = code
         return klass
 
diff --git a/kazoo/tests/test_exceptions.py b/kazoo/tests/test_exceptions.py
index 154bcb7..eac65c4 100644
--- a/kazoo/tests/test_exceptions.py
+++ b/kazoo/tests/test_exceptions.py
@@ -20,3 +20,9 @@ class ExceptionsTestCase(TestCase):
     def test_invalid_code(self):
         module = self._get()
         self.assertRaises(RuntimeError, module.EXCEPTIONS.__getitem__, 666)
+
+    def test_exceptions_construction(self):
+        module = self._get()
+        exc = module.EXCEPTIONS[-101]()
+        assert type(exc) is module.NoNodeError
+        assert exc.args == ()