[Checkins] SVN: zope.container/trunk/src/zope/container/traversal.py copy over the whole stanza from zope.app.publisher

Wolfgang Schnerring wosc at wosc.de
Thu Jan 29 09:42:41 EST 2009


Log message for revision 95438:
  copy over the whole stanza from zope.app.publisher
  

Changed:
  U   zope.container/trunk/src/zope/container/traversal.py

-=-
Modified: zope.container/trunk/src/zope/container/traversal.py
===================================================================
--- zope.container/trunk/src/zope/container/traversal.py	2009-01-29 14:41:18 UTC (rev 95437)
+++ zope.container/trunk/src/zope/container/traversal.py	2009-01-29 14:42:40 UTC (rev 95438)
@@ -17,8 +17,8 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.interface import implements
-from zope.component import queryMultiAdapter
+from zope.interface import implements, providedBy
+from zope.component import queryMultiAdapter, getSiteManager
 from zope.component.interfaces import IDefaultViewName
 from zope.traversing.interfaces import TraversalError, ITraversable
 from zope.publisher.interfaces.browser import IBrowserPublisher
@@ -57,7 +57,8 @@
         """See zope.publisher.browser.interfaces.IBrowserPublisher"""
         # XXX this re-implements zope.app.publisher.browser.getDefaultViewName()
         # to break our only dependency on it.
-        view_name = queryMultiAdapter((self.context, request), IDefaultViewName)
+        view_name = getSiteManager(None).adapters.lookup(
+            map(providedBy, (self.context, request)), IDefaultViewName)
         if view_name is None:
             raise ComponentLookupError("Couldn't find default view name",
                                        context, request)



More information about the Checkins mailing list