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

[Andreas Jung]

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

Modified Files:
      Tag: Zope-3x-branch
	ZopePublication.py 
Log Message:
changed using getRequestView() instead of getView()



=== Zope3/lib/python/Zope/App/ZopePublication/ZopePublication.py 1.1.2.21 => 1.1.2.22 ===
 from zLOG import LOG, ERROR, INFO
 from Zope.Publisher.Exceptions import NotFound, DebugError
-from Zope.ComponentArchitecture import getView
+from Zope.ComponentArchitecture import getRequestView
 from Zope.Publisher.DefaultPublication import DefaultPublication
 from Zope.Publisher.mapply import mapply
 from Zope.Publisher.Exceptions import Retry
@@ -163,7 +163,7 @@
         if IBrowserPublisher.isImplementedBy(ob):
             ob2 = ob.browser_traverse(request, name)
         else:
-            adapter = getView(ob, '_traverse', IBrowserPublisher)
+            adapter = getRequestView(ob, '_traverse', request)
             if adapter is not None:
                 ob2 =  adapter.browser_traverse(request, name)
             else:
@@ -177,7 +177,7 @@
         if IBrowserPublisher.isImplementedBy(ob):
             r = ob.browser_default(request)
         else:
-            adapter = getView(ob, '_traverse', IBrowserPublisher, None)
+            adapter = getRequestView(ob, '_traverse', request , None)
             if adapter is not None:
                 r = adapter.browser_default(request)
             else: