diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-02 19:32:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-02 19:32:40 +0000 |
| commit | e9928de9bd73c30a0946ce53f5d4cd40d4520d20 (patch) | |
| tree | 0cc8c26ee9f3a9670a69fcde6439e9e4173ec291 /nova/api | |
| parent | ca2bb061a728bb5db8781f298c18c980d9d91863 (diff) | |
| parent | 524bfb84f5119315af56556cc9911f92c538b5b0 (diff) | |
| download | nova-e9928de9bd73c30a0946ce53f5d4cd40d4520d20.tar.gz nova-e9928de9bd73c30a0946ce53f5d4cd40d4520d20.tar.xz nova-e9928de9bd73c30a0946ce53f5d4cd40d4520d20.zip | |
Merge "Update common.importutils from openstack-common."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/extensions.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 750d7c394..b1c244e4b 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -27,7 +27,6 @@ from nova.api.openstack import xmlutil from nova import exception from nova import flags from nova import log as logging -from nova.openstack.common import exception as common_exception from nova.openstack.common import importutils import nova.policy @@ -358,7 +357,7 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None): (package, relpkg, dname)) try: ext = importutils.import_class(ext_name) - except common_exception.NotFound: + except ImportError: # extension() doesn't exist on it, so we'll explore # the directory for ourselves subdirs.append(dname) |