From c8465c8e413080fae0509eb2d66d5352af921086 Mon Sep 17 00:00:00 2001 From: Matthew Farrellee Date: Fri, 30 May 2014 16:31:05 -0400 Subject: [PATCH] Update oslo-incubator importutils Changes - * Remove ValueError when accessing sys.modules Change-Id: I19f6d775e00dcfa886983498de91a677f08b5307 --- saharaclient/openstack/common/importutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/saharaclient/openstack/common/importutils.py b/saharaclient/openstack/common/importutils.py index a0e66776..fcb8f04b 100644 --- a/saharaclient/openstack/common/importutils.py +++ b/saharaclient/openstack/common/importutils.py @@ -24,10 +24,10 @@ import traceback 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) try: - __import__(mod_str) return getattr(sys.modules[mod_str], class_str) - except (ValueError, AttributeError): + except AttributeError: raise ImportError('Class %s cannot be found (%s)' % (class_str, traceback.format_exception(*sys.exc_info())))