diff options
| -rw-r--r-- | openstack/common/service.py | 7 | ||||
| -rw-r--r-- | tools/pip-requires | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/openstack/common/service.py b/openstack/common/service.py index 0c355f7..910a738 100644 --- a/openstack/common/service.py +++ b/openstack/common/service.py @@ -27,6 +27,7 @@ import sys import time import eventlet +import extras import logging as std_logging from openstack.common import cfg @@ -35,11 +36,7 @@ from openstack.common.gettextutils import _ from openstack.common import log as logging from openstack.common import threadgroup -try: - from openstack.common import rpc -except ImportError: - rpc = None - +rpc = extras.try_import('openstack.common.rpc') CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/tools/pip-requires b/tools/pip-requires index 5040d73..2403294 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,6 +1,7 @@ PasteDeploy==1.5.0 WebOb==1.0.8 eventlet +extras greenlet>=0.3.1 lxml routes==1.12.3 |