From 524bfb84f5119315af56556cc9911f92c538b5b0 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 2 May 2012 13:44:20 -0400 Subject: Update common.importutils from openstack-common. This patch updates common.importutils from openstack-common. The change was to remove the usage of common.exception. The rest of the patch includes the changes required in nova to no longer use common.exception, as well. Change-Id: Iacd186b2c466cba84248ae10589ffbb5a9cec0ba --- nova/api/openstack/extensions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nova/api') 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) -- cgit