Merge "Implement importutils.try_import."

2 files changed, 10 insertions, 2 deletions

diff --git a/openstack/common/importutils.py b/openstack/common/importutils.py
index 2a28b45..9dec764 100644
--- a/openstack/common/importutils.py
+++ b/openstack/common/importutils.py
@@ -57,3 +57,11 @@ def import_module(import_str):
     """Import a module."""
     __import__(import_str)
     return sys.modules[import_str]
+
+
+def try_import(import_str, default=None):
+    """Try to import a module and if it fails return default."""
+    try:
+        return import_module(import_str)
+    except ImportError:
+        return default
diff --git a/openstack/common/service.py b/openstack/common/service.py
index 740378f..6b180aa 100644
--- a/openstack/common/service.py
+++ b/openstack/common/service.py
@@ -27,17 +27,17 @@ import sys
 import time
 
 import eventlet
-import extras
 import logging as std_logging
 
 from openstack.common import cfg
 from openstack.common import eventlet_backdoor
 from openstack.common.gettextutils import _
+from openstack.common import importutils
 from openstack.common import log as logging
 from openstack.common import threadgroup
 
 
-rpc = extras.try_import('openstack.common.rpc')
+rpc = importutils.try_import('openstack.common.rpc')
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)