[Checkins] SVN: zope.container/trunk/s removed dependency to zope.app.publisher

[Wolfgang Schnerring]

Log message for revision 95429:
  removed dependency to zope.app.publisher
  

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

-=-
Modified: zope.container/trunk/setup.py
===================================================================
--- zope.container/trunk/setup.py	2009-01-29 13:16:22 UTC (rev 95428)
+++ zope.container/trunk/setup.py	2009-01-29 13:25:23 UTC (rev 95429)
@@ -61,7 +61,6 @@
 
       install_requires=['setuptools',
                         'zope.interface',
-                        'zope.app.publisher',
                         'zope.cachedescriptors',
                         'zope.dottedname',
                         'zope.schema',

Modified: zope.container/trunk/src/zope/container/traversal.py
===================================================================
--- zope.container/trunk/src/zope/container/traversal.py	2009-01-29 13:16:22 UTC (rev 95428)
+++ zope.container/trunk/src/zope/container/traversal.py	2009-01-29 13:25:23 UTC (rev 95429)
@@ -19,6 +19,7 @@
 
 from zope.interface import implements
 from zope.component import queryMultiAdapter
+from zope.component.interfaces import IDefaultViewName
 from zope.traversing.interfaces import TraversalError, ITraversable
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
@@ -55,7 +56,12 @@
 
     def browserDefault(self, request):
         """See zope.publisher.browser.interfaces.IBrowserPublisher"""
-        view_name = getDefaultViewName(self.context, request)
+        # XXX this re-implements zope.app.publisher.browser.getDefaultViewName()
+        # to break our only dependency on it.
+        view_name = queryMultiAdapter((self.context, request), IDefaultViewName)
+        if view_name is None:
+            raise ComponentLookupError("Couldn't find default view name",
+                                       context, request)
         view_uri = "@@%s" %view_name
         return self.context, (view_uri,)