Merge "Remove common.exception from common.importutils."

2 files changed, 2 insertions, 5 deletions

diff --git a/openstack/common/importutils.py b/openstack/common/importutils.py
index 48b7af1..7654af5 100644
--- a/openstack/common/importutils.py
+++ b/openstack/common/importutils.py
@@ -21,8 +21,6 @@ Import related utilities and helper functions.
 
 import sys
 
-from openstack.common import exception
-
 
 def import_class(import_str):
     """Returns a class from a string including module and class"""
@@ -31,7 +29,7 @@ def import_class(import_str):
         __import__(mod_str)
         return getattr(sys.modules[mod_str], class_str)
     except (ImportError, ValueError, AttributeError), exc:
-        raise exception.NotFound('Class %s cannot be found (%s)' %
+        raise ImportError('Class %s cannot be found (%s)' %
                 (class_str, str(exc)))
 
 
diff --git a/tests/unit/test_importutils.py b/tests/unit/test_importutils.py
index 4cc12ab..e9b5b2e 100644
--- a/tests/unit/test_importutils.py
+++ b/tests/unit/test_importutils.py
@@ -19,7 +19,6 @@ import datetime
 import sys
 import unittest
 
-from openstack.common import exception
 from openstack.common import importutils
 
 
@@ -32,7 +31,7 @@ class ImportUtilsTest(unittest.TestCase):
         self.assertEqual(sys.modules['datetime'].datetime, dt)
 
     def test_import_bad_class(self):
-        self.assertRaises(exception.NotFound, importutils.import_class,
+        self.assertRaises(ImportError, importutils.import_class,
                           'lol.u_mad.brah')
 
     def test_import_module(self):