From 6fd7d0a06b2ec0153765c9f25d7e7f4892683373 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 12 Aug 2008 01:53:54 +0000 Subject: Fix ITraverserFactory lookup; release 0.2.9. --- repoze/bfg/router.py | 4 ++-- repoze/bfg/tests/test_router.py | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'repoze') diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py index 0333c8a99..d6b60f5ec 100644 --- a/repoze/bfg/router.py +++ b/repoze/bfg/router.py @@ -1,4 +1,4 @@ -from zope.component import getMultiAdapter +from zope.component import getAdapter from zope.component import queryMultiAdapter from zope.component import queryUtility from zope.component.event import dispatch @@ -33,7 +33,7 @@ class Router: directlyProvides(request, IRequest) dispatch(NewRequest(request)) root = self.root_policy(environ) - traverser = getMultiAdapter((root, request), ITraverserFactory) + traverser = getAdapter(root, ITraverserFactory) context, name, subpath = traverser(environ) request.context = context diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py index d2907ef8a..b2c5cb468 100644 --- a/repoze/bfg/tests/test_router.py +++ b/repoze/bfg/tests/test_router.py @@ -61,7 +61,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): environ = self._makeEnviron() context = DummyContext() traversalfactory = make_traversal_factory(context, '', []) - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() result = router(environ, start_response) @@ -79,7 +79,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): response.app_iter = ['Hello world'] view = make_view(response) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, '', None, None) router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() @@ -99,7 +99,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): response.app_iter = ['Hello world'] view = make_view(response) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, 'foo', None, None) router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() @@ -125,7 +125,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): response.app_iter = ['Hello world'] view = make_view(response) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, '', IContext, IRequest) router = self._makeOne(rootpolicy, None) start_response = DummyStartResponse() @@ -152,7 +152,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): response = DummyResponse() view = make_view(response) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, '', IContext, IRequest) app_context = make_appcontext() router = self._makeOne(rootpolicy, None) @@ -174,7 +174,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): response = DummyResponse() view = make_view(response) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, '', IContext, IRequest) secpol = DummySecurityPolicy() self._registerSecurityPolicy(secpol) @@ -199,7 +199,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): secpol = DummySecurityPolicy() permissionfactory = make_permission_factory(True) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, '', IContext, IRequest) self._registerSecurityPolicy(secpol) self._registerPermission(permissionfactory, '', IContext, IRequest) @@ -225,7 +225,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): secpol = DummySecurityPolicy() permissionfactory = make_permission_factory(False) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, '', IContext, IRequest) self._registerSecurityPolicy(secpol) self._registerPermission(permissionfactory, '', IContext, IRequest) @@ -245,7 +245,7 @@ class RouterTests(unittest.TestCase, PlacelessSetup): response.app_iter = ['Hello world'] view = make_view(response) environ = self._makeEnviron() - self._registerTraverserFactory(traversalfactory, '', None, None) + self._registerTraverserFactory(traversalfactory, '', None) self._registerView(view, '', None, None) from repoze.bfg.interfaces import INewRequest from repoze.bfg.interfaces import INewResponse @@ -310,9 +310,8 @@ def make_view(response): def make_traversal_factory(context, name, subpath): class DummyTraversalFactory: - def __init__(self, root, request): + def __init__(self, root): self.root = root - self.request = request def __call__(self, path): return context, name, subpath -- cgit v1.2.3