openstack
/
oslo-incubator
Code Issues Proposed changes

Deleted duplicated method in cliutils. 

Method import_class in cliutils duplicates method in importutils module,
and method import_versioned_module is more related to import tools,
so it is moved in appropriate module.

bp common-client-library-2

Change-Id: I7b8892b2885f8b05a8106300371481209e99749d
This commit is contained in:
ekudryashova 2014-01-21 14:31:50 +02:00
parent 6b2d15fe64
commit 885828af22
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openstack/common/cliutils.py
View File

@ -30,7 +30,6 @@ from six import moves
from openstack.common.apiclient import exceptions
from openstack.common.gettextutils import _
from openstack.common import importutils
from openstack.common import strutils
from openstack.common import uuidutils
@ -304,20 +303,6 @@ def pretty_choice_list(l):
return ', '.join("'%s'" % i for i in l)
def import_class(import_str):
"""Returns a class from a string including module and class."""
mod_str, _sep, class_str = import_str.rpartition('.')
__import__(mod_str)
return getattr(sys.modules[mod_str], class_str)
def import_versioned_module(version, submodule=None):
module = 'oslo.v%s' % version
if submodule:
module = '.'.join((module, submodule))
return importutils.import_module(module)
def exit(msg=''):
if msg:
print (msg, file=sys.stderr)

7
openstack/common/importutils.py
View File

@ -58,6 +58,13 @@ def import_module(import_str):
return sys.modules[import_str]
def import_versioned_module(version, submodule=None):
module = 'oslo.v%s' % version
if submodule:
module = '.'.join((module, submodule))
return import_module(module)
def try_import(import_str, default=None):
"""Try to import a module and if it fails return default."""
try: