From 9fcb68e1563e22eed1fd7cbbd10993cff30242f8 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 13 Jul 2008 21:26:50 +0000 Subject: Don't stash away the context. --- repoze/bfg/registry.py | 4 ++-- repoze/bfg/router.py | 11 +++++------ repoze/bfg/tests/test_registry.py | 7 +++---- repoze/bfg/tests/test_router.py | 16 ++++++---------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py index acb5a4abc..daf4b58d5 100644 --- a/repoze/bfg/registry.py +++ b/repoze/bfg/registry.py @@ -50,8 +50,8 @@ def makeRegistry(filename, package, lock=threading.Lock()): registry_manager.set(registry) original_getSiteManager.sethook(getSiteManager) zope.component.getGlobalSiteManager = registry_manager.get - context = xmlconfig.file(filename, package=package) - return context, registry + xmlconfig.file(filename, package=package) + return registry finally: lock.release() zope.component.getGlobalSiteManager = getGlobalSiteManager diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py index ff5c878a2..00966dfd1 100644 --- a/repoze/bfg/router.py +++ b/repoze/bfg/router.py @@ -15,13 +15,12 @@ from repoze.bfg.registry import registry_manager _marker = () class Router: - def __init__(self, root_policy, app_context, app_registry): + def __init__(self, root_policy, registry): self.root_policy = root_policy - self.app_context = app_context - self.app_registry = app_registry + self.registry = registry def __call__(self, environ, start_response): - registry_manager.set(self.app_registry) + registry_manager.set(self.registry) request = Request(environ) directlyProvides(request, IRequest) root = self.root_policy(environ) @@ -42,7 +41,7 @@ class Router: def make_app(root_policy, package=None, filename='configure.zcml'): from repoze.bfg.registry import makeRegistry - context, registry = makeRegistry(filename, package) - return Router(root_policy, context, registry) + registry = makeRegistry(filename, package) + return Router(root_policy, registry) diff --git a/repoze/bfg/tests/test_registry.py b/repoze/bfg/tests/test_registry.py index 11770824a..0d051c131 100644 --- a/repoze/bfg/tests/test_registry.py +++ b/repoze/bfg/tests/test_registry.py @@ -21,10 +21,9 @@ class TestMakeRegistry(unittest.TestCase, PlacelessSetup): import repoze.bfg.registry try: old = repoze.bfg.registry.setRegistryManager(dummyregmgr) - context, registry = makeRegistry('configure.zcml', - fixtureapp, - lock=dummylock) - self.assertEqual(context.package, fixtureapp) + registry = makeRegistry('configure.zcml', + fixtureapp, + lock=dummylock) from zope.component.registry import Components self.failUnless(isinstance(registry, Components)) self.assertEqual(dummylock.acquired, True) diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py index ca3cf5ade..8bb579054 100644 --- a/repoze/bfg/tests/test_router.py +++ b/repoze/bfg/tests/test_router.py @@ -51,8 +51,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): context = DummyContext() traversalfactory = make_traversal_factory(context, '', []) self._registerTraverserFactory(traversalfactory, '', None, None) - app_context = make_appcontext() - router = self._makeOne(rootpolicy, app_context, None) + router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() result = router(environ, start_response) headers = start_response.headers @@ -72,8 +71,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): self._registerTraverserFactory(traversalfactory, '', None, None) self._registerViewFactory(viewfactory, '', None, None) self._registerWSGIFactory(wsgifactory, '', None, None, None) - app_context = make_appcontext() - router = self._makeOne(rootpolicy, app_context, None) + router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() result = router(environ, start_response) self.assertEqual(result, ['Hello world']) @@ -94,8 +92,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): self._registerTraverserFactory(traversalfactory, '', None, None) self._registerViewFactory(viewfactory, 'foo', None, None) self._registerWSGIFactory(wsgifactory, '', None, None, None) - app_context = make_appcontext() - router = self._makeOne(rootpolicy, app_context, None) + router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() result = router(environ, start_response) self.assertEqual(result, ['Hello world']) @@ -122,8 +119,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): self._registerTraverserFactory(traversalfactory, '', None, None) self._registerViewFactory(viewfactory, '', IContext, IRequest) self._registerWSGIFactory(wsgifactory, '', None, None, None) - app_context = make_appcontext() - router = self._makeOne(rootpolicy, app_context, None) + router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() result = router(environ, start_response) self.assertEqual(result, ['Hello world']) @@ -153,7 +149,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): self._registerViewFactory(viewfactory, '', IContext, IRequest) self._registerWSGIFactory(wsgifactory, '', None, None, None) app_context = make_appcontext() - router = self._makeOne(rootpolicy, app_context, None) + router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() result = router(environ, start_response) self.failUnless('404' in result[0]) @@ -175,7 +171,7 @@ class MakeAppTests(unittest.TestCase, PlacelessSetup): make_app = self._getFUT() rootpolicy = make_rootpolicy(None) app = make_app(rootpolicy, fixtureapp) - self.assertEqual(app.app_context.package, fixtureapp) + self.assertEqual(app.registry.__name__, 'repoze.bfg.tests.fixtureapp') self.assertEqual(app.root_policy, rootpolicy) class DummyContext: -- cgit v1.2.3