Commit 96e42254 authored by Wolfgang Schnerring's avatar Wolfgang Schnerring

removed dependency to zope.app.publisher

parent 189cade4
...@@ -61,7 +61,6 @@ setup(name='zope.container', ...@@ -61,7 +61,6 @@ setup(name='zope.container',
install_requires=['setuptools', install_requires=['setuptools',
'zope.interface', 'zope.interface',
'zope.app.publisher',
'zope.cachedescriptors', 'zope.cachedescriptors',
'zope.dottedname', 'zope.dottedname',
'zope.schema', 'zope.schema',
......
...@@ -19,6 +19,7 @@ __docformat__ = 'restructuredtext' ...@@ -19,6 +19,7 @@ __docformat__ = 'restructuredtext'
from zope.interface import implements from zope.interface import implements
from zope.component import queryMultiAdapter from zope.component import queryMultiAdapter
from zope.component.interfaces import IDefaultViewName
from zope.traversing.interfaces import TraversalError, ITraversable from zope.traversing.interfaces import TraversalError, ITraversable
from zope.publisher.interfaces.browser import IBrowserPublisher from zope.publisher.interfaces.browser import IBrowserPublisher
from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
...@@ -55,7 +56,12 @@ class ContainerTraverser(object): ...@@ -55,7 +56,12 @@ class ContainerTraverser(object):
def browserDefault(self, request): def browserDefault(self, request):
"""See zope.publisher.browser.interfaces.IBrowserPublisher""" """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 view_uri = "@@%s" %view_name
return self.context, (view_uri,) return self.context, (view_uri,)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment