diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-16 12:30:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-16 12:30:19 +0000 |
| commit | fa11427af53595532124c74991ddcee6a89624ff (patch) | |
| tree | a72c9f1cbb550dd8210eaaae486da3097618ab7c | |
| parent | 07e0cb9e2b0cc7c795c1a7d9120b19c09cb218f4 (diff) | |
| parent | 4773c9667251043333d9c3e0c56e9d262186380d (diff) | |
| download | python-glanceclient-fa11427af53595532124c74991ddcee6a89624ff.tar.gz | |
Merge "Use import_versioned_module from oslo.utils"
| -rw-r--r-- | glanceclient/client.py | 5 | ||||
| -rw-r--r-- | glanceclient/common/utils.py | 8 | ||||
| -rw-r--r-- | glanceclient/shell.py | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/glanceclient/client.py b/glanceclient/client.py index 714c96a..c0e8cc8 100644 --- a/glanceclient/client.py +++ b/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) diff --git a/glanceclient/common/utils.py b/glanceclient/common/utils.py index 9f3a1fe..93229e6 100644 --- a/glanceclient/common/utils.py +++ b/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) diff --git a/glanceclient/shell.py b/glanceclient/shell.py index 51e02a6..2c5fb4b 100644 --- a/glanceclient/shell.py +++ b/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) |