Bug 903684: functions defined twice in utils.py
Removing duplicate definition for import_class and import_object Change-Id: Ib651ca7b0f87c36f6d4f51ed2d55745e3576c390
This commit is contained in:
parent
2ccf22e98a
commit
8dc864f42c
|
@ -132,28 +132,6 @@ def bool_from_string(subject):
|
|||
return False
|
||||
|
||||
|
||||
def import_class(import_str):
|
||||
"""Returns a class from a string including module and class"""
|
||||
mod_str, _sep, class_str = import_str.rpartition('.')
|
||||
try:
|
||||
#mod_str = os.path.join(FLAGS.state_path, mod_str)
|
||||
__import__(mod_str)
|
||||
return getattr(sys.modules[mod_str], class_str)
|
||||
except (ImportError, ValueError, AttributeError) as e:
|
||||
print e
|
||||
raise exception.ClassNotFound(class_name=class_str)
|
||||
|
||||
|
||||
def import_object(import_str):
|
||||
"""Returns an object including a module or module and class"""
|
||||
try:
|
||||
__import__(import_str)
|
||||
return sys.modules[import_str]
|
||||
except ImportError:
|
||||
cls = import_class(import_str)
|
||||
return cls()
|
||||
|
||||
|
||||
def fetchfile(url, target):
|
||||
logging.debug("Fetching %s" % url)
|
||||
# c = pycurl.Curl()
|
||||
|
|
Loading…
Reference in New Issue