[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication - PublicationTraverse.py:1.1.2.10

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZopePublication
In directory cvs.zope.org:/tmp/cvs-serv20135/App/ZopePublication

Modified Files:
      Tag: Zope-3x-branch
	PublicationTraverse.py 
Log Message:
Make this file Browser view type independent.


=== Zope3/lib/python/Zope/App/ZopePublication/PublicationTraverse.py 1.1.2.9 => 1.1.2.10 ===
 from Zope.Publisher.Exceptions import NotFound
 from types import StringTypes
-from Zope.ContextWrapper import wrapper
+from Zope.ContextWrapper import Wrapper
 
 class DuplicateNamespaces(Exception):
     """More than one namespave was specified in a request"""
@@ -86,7 +86,7 @@
         if nm == '.':
             return ob
                 
-        if IBrowserPublisher.isImplementedBy(ob):
+        if request.getViewType().isImplementedBy(ob):
             ob2 = ob.publishTraverse(request, nm)
         else:
             adapter = getRequestView(ob, '_traverse', request, self # marker
@@ -100,7 +100,7 @@
         return self._wrap(ob2, ob, name, nm)
 
     def _wrap(self, ob, parent, name, nm):
-        wrapped = wrapper.Wrapper(ob, parent, name=name)
+        wrapped = Wrapper(ob, parent, name=name)
         getSecurityManager().validate(nm, wrapped)
         return wrapped