diff options
| author | shizhihui <zhihui.shi@easystack.cn> | 2016-11-02 16:09:48 +0800 |
|---|---|---|
| committer | shizhihui <zhihui.shi@easystack.cn> | 2016-11-09 09:07:39 +0000 |
| commit | 8885ce78189ac2239ec0400f6fec734627bf1218 (patch) | |
| tree | 539f9bf8171436a4406f580cd17d03ea26c741c9 | |
| parent | 61794b78220a556cb110d1c948e6eedd55f224c0 (diff) | |
| download | python-heatclient-8885ce78189ac2239ec0400f6fec734627bf1218.tar.gz | |
Make method import_versioned_module work
Oslo.utils 3.17 provides similar function, just use it.
For more information:
[1] http://docs.openstack.org/developer/oslo.utils/history.html
Closes-Bug: #1627313
Change-Id: Ie738e910cc72535fe97295d7e118eda2412ecd15
| -rw-r--r-- | heatclient/client.py | 5 | ||||
| -rw-r--r-- | heatclient/common/utils.py | 8 | ||||
| -rw-r--r-- | heatclient/shell.py | 3 |
3 files changed, 5 insertions, 11 deletions
diff --git a/heatclient/client.py b/heatclient/client.py index 8237b8e..77444f4 100644 --- a/heatclient/client.py +++ b/heatclient/client.py @@ -10,10 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from heatclient.common import utils +from oslo_utils import importutils def Client(version, *args, **kwargs): - module = utils.import_versioned_module(version, 'client') + module = importutils.import_versioned_module('heatclient', + version, 'client') client_class = getattr(module, 'Client') return client_class(*args, **kwargs) diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py index 91410ac..dfc8378 100644 --- a/heatclient/common/utils.py +++ b/heatclient/common/utils.py @@ -21,7 +21,6 @@ import uuid from oslo_serialization import jsonutils from oslo_utils import encodeutils -from oslo_utils import importutils import prettytable import six from six.moves.urllib import error @@ -239,13 +238,6 @@ def find_resource(manager, name_or_id): raise exc.CommandError(msg) -def import_versioned_module(version, submodule=None): - module = 'heatclient.v%s' % version - if submodule: - module = '.'.join((module, submodule)) - return importutils.import_module(module) - - def format_parameters(params, parse_semicolon=True): '''Reformat parameters into dict of format expected by the API.''' diff --git a/heatclient/shell.py b/heatclient/shell.py index 558fb8a..be9cf4e 100644 --- a/heatclient/shell.py +++ b/heatclient/shell.py @@ -348,7 +348,8 @@ class HeatShell(object): self.subcommands = {} subparsers = parser.add_subparsers(metavar='<subcommand>') - submodule = utils.import_versioned_module(version, 'shell') + submodule = importutils.import_versioned_module('heatclient', + version, 'shell') self._find_actions(subparsers, submodule) self._find_actions(subparsers, self) self._add_bash_completion_subparser(subparsers) |