Merge "Use import_versioned_module from oslo.utils"

glanceclient/client.py

@@ -15,6 +15,8 @@
 
 import warnings
 
+from oslo_utils import importutils
+
 from glanceclient.common import utils
 
 
@@ -56,6 +58,7 @@ def Client(version=None, endpoint=None, session=None, *args, **kwargs):
                    "http://$HOST:$PORT/v$VERSION_NUMBER")
             raise RuntimeError(msg)
 
-    module = utils.import_versioned_module(int(version), 'client')
+    module = importutils.import_versioned_module('glanceclient', int(version),
+                                                 'client')
     client_class = getattr(module, 'Client')
     return client_class(endpoint, *args, session=session, **kwargs)

glanceclient/common/utils.py

@@ -26,7 +26,6 @@ import sys
 import threading
 import uuid
 
-from oslo_utils import importutils
 import six
 
 if os.name == 'nt':
@@ -259,13 +258,6 @@ def env(*vars, **kwargs):
     return kwargs.get('default', '')
 
 
-def import_versioned_module(version, submodule=None):
-    module = 'glanceclient.v%s' % version
-    if submodule:
-        module = '.'.join((module, submodule))
-    return importutils.import_module(module)
-
-
 def exit(msg='', exit_code=1):
     if msg:
         print_err(msg)

glanceclient/shell.py

@@ -211,7 +211,8 @@ class OpenStackImagesShell(object):
 
         self.subcommands = {}
         subparsers = parser.add_subparsers(metavar='<subcommand>')
-        submodule = utils.import_versioned_module(version, 'shell')
+        submodule = importutils.import_versioned_module('glanceclient',
+                                                        version, 'shell')
 
         self._find_actions(subparsers, submodule)
         self._find_actions(subparsers, self)