diff --git a/test-requirements.txt b/test-requirements.txt index cbe66954..d3df35a2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -24,6 +24,3 @@ sysv-ipc>=0.6.8 # BSD License kazoo>=2.2 # Apache-2.0 pymemcache!=1.3.0,>=1.2.9 # Apache 2.0 License redis>=2.10.0 # MIT - -# Ensure that the eventlet executor continues to operate... -eventlet!=0.18.3,>=0.18.2 # MIT diff --git a/tooz/drivers/zookeeper.py b/tooz/drivers/zookeeper.py index 4f5521de..144cbc39 100644 --- a/tooz/drivers/zookeeper.py +++ b/tooz/drivers/zookeeper.py @@ -19,7 +19,10 @@ import copy from kazoo import client from kazoo import exceptions -from kazoo.handlers import eventlet as eventlet_handler +try: + from kazoo.handlers import eventlet as eventlet_handler +except ImportError: + eventlet_handler = None from kazoo.handlers import threading as threading_handler from kazoo.protocol import paths from oslo_utils import encodeutils @@ -425,9 +428,12 @@ class KazooDriver(BaseZooKeeperDriver): """ HANDLERS = { - 'eventlet': eventlet_handler.SequentialEventletHandler, 'threading': threading_handler.SequentialThreadingHandler, } + + if eventlet_handler: + HANDLERS['eventlet'] = eventlet_handler.SequentialEventletHandler + """ Restricted immutable dict of handler 'kinds' -> handler classes that this driver can accept via 'handler' option key (the expected value for