diff --git a/zookeeper-contrib/zookeeper-contrib-monitoring/test.py b/zookeeper-contrib/zookeeper-contrib-monitoring/test.py index 3941291fcab..020822cad8b 100755 --- a/zookeeper-contrib/zookeeper-contrib-monitoring/test.py +++ b/zookeeper-contrib/zookeeper-contrib-monitoring/test.py @@ -164,7 +164,7 @@ class HandlerTestCase(unittest.TestCase): def setUp(self): try: sys._stdout - except: + except Exception: sys._stdout = sys.stdout sys.stdout = StringIO() diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/zk.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/zk.py index 24986e3aac8..6f94488e426 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/zk.py +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/zk.py @@ -48,7 +48,7 @@ def my_getc_watch( handle, type, state, path ): zookeeper.get_children(handle, "/zk-python", my_getc_watch) for i in xrange(5): print("Creating sequence node ", i, " ", zookeeper.create(handle, "/zk-python/sequencenode", "data", [ZOO_OPEN_ACL_UNSAFE], zookeeper.SEQUENCE )) -except: +except Exception: pass def pp_zk(handle,root, indent = 0): diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/acl_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/acl_test.py index 1289c8a3439..cc7653a6e3b 100644 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/acl_test.py +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/acl_test.py @@ -29,7 +29,7 @@ def setUp(self): try: zookeeper.delete(self.handle, "/zk-python-acltest") zookeeper.delete(self.handle, "/zk-python-aacltest") - except: + except Exception: pass def test_sync_acl(self): diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py index 29f63a9ffb4..9318643ae2e 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py @@ -28,7 +28,7 @@ def setUp(self): try: zookeeper.delete(self.handle, "/zk-python-createtest") zookeeper.delete(self.handle, "/zk-python-acreatetest") - except: + except Exception: pass def test_sync_create(self): diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/exists_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/exists_test.py index ddc6ef3683b..6f493883ef8 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/exists_test.py +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/exists_test.py @@ -25,7 +25,7 @@ def setUp( self ): try: zookeeper.create(self.handle, "/zk-python-existstest","existstest", [ZOO_OPEN_ACL_UNSAFE],zookeeper.EPHEMERAL) zookeeper.create(self.handle, "/zk-python-aexiststest","existstest",[ZOO_OPEN_ACL_UNSAFE],zookeeper.EPHEMERAL) - except: + except Exception: pass def test_sync_exists(self): diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py index 226e8c183ff..ef2111d8973 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py @@ -29,7 +29,7 @@ def setUp( self ): zookeeper.create(self.handle, "/zk-python-getsettest", "on",[ZOO_OPEN_ACL_UNSAFE], zookeeper.EPHEMERAL) zookeeper.create(self.handle, "/zk-python-agetsettest", "on",[ZOO_OPEN_ACL_UNSAFE], zookeeper.EPHEMERAL) - except: + except Exception: pass def test_empty_node(self):