From 4acd7829ab0857356594dce3b841f4d785cf2aa1 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 3 Apr 2012 17:05:37 -0400 Subject: Change behavior in utils.import_object(). Fix bug 972859. Prior to this patch, utils.import_object(foo) and utils.import_class(foo) would return the same thing if foo was the path to a class. This patch changes utils.import_object() to return an instance of the class, instead, also allowing you to pass in arguments to the constructor. This patch also removes the odd behavior of import_object() to be able to also import a module. Instead, a new function import_module() has been added. Finally, the three import helpers have been moved to a new module, importutils. Change-Id: Ia2ea64c965692f8c3a29adec332dd93a83980070 --- openstack/common/middleware/context.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openstack/common/middleware') diff --git a/openstack/common/middleware/context.py b/openstack/common/middleware/context.py index be7dafe..b89ca91 100644 --- a/openstack/common/middleware/context.py +++ b/openstack/common/middleware/context.py @@ -19,9 +19,9 @@ Middleware that attaches a context to the WSGI request """ -from openstack.common import utils -from openstack.common import wsgi from openstack.common import context +from openstack.common import importutils +from openstack.common import wsgi class ContextMiddleware(wsgi.Middleware): @@ -37,7 +37,7 @@ class ContextMiddleware(wsgi.Middleware): # Determine the context class to use ctxcls = context.RequestContext if 'context_class' in self.options: - ctxcls = utils.import_class(self.options['context_class']) + ctxcls = importutils.import_class(self.options['context_class']) return ctxcls(*args, **kwargs) -- cgit