Merge "Deleted duplicated method in cliutils."
This commit is contained in:
commit
9a7f2f8543
|
@ -30,7 +30,6 @@ from six import moves
|
||||||
|
|
||||||
from openstack.common.apiclient import exceptions
|
from openstack.common.apiclient import exceptions
|
||||||
from openstack.common.gettextutils import _
|
from openstack.common.gettextutils import _
|
||||||
from openstack.common import importutils
|
|
||||||
from openstack.common import strutils
|
from openstack.common import strutils
|
||||||
from openstack.common import uuidutils
|
from openstack.common import uuidutils
|
||||||
|
|
||||||
|
@ -304,20 +303,6 @@ def pretty_choice_list(l):
|
||||||
return ', '.join("'%s'" % i for i in 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=''):
|
def exit(msg=''):
|
||||||
if msg:
|
if msg:
|
||||||
print (msg, file=sys.stderr)
|
print (msg, file=sys.stderr)
|
||||||
|
|
|
@ -58,6 +58,13 @@ def import_module(import_str):
|
||||||
return sys.modules[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):
|
def try_import(import_str, default=None):
|
||||||
"""Try to import a module and if it fails return default."""
|
"""Try to import a module and if it fails return default."""
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue