[Zope3-checkins] CVS: Zope3/src/zope/app/publication - browser.py:1.13 zopepublication.py:1.38

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/publication
In directory cvs.zope.org:/tmp/cvs-serv21993/src/zope/app/publication

Modified Files:
	browser.py zopepublication.py 
Log Message:
Changed most calls to queryAdapter to use interface calls instead.


=== Zope3/src/zope/app/publication/browser.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/publication/browser.py:1.12	Fri Mar  5 17:09:13 2004
+++ Zope3/src/zope/app/publication/browser.py	Sat Mar  6 12:48:52 2004
@@ -20,7 +20,7 @@
 from zope.app.publication.publicationtraverse \
      import PublicationTraverser as PublicationTraverser_
 from zope.app.publication.zopepublication import ZopePublication
-from zope.component import queryAdapter, queryView
+from zope.component import queryView
 from zope.proxy import removeAllProxies
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.security.checker import ProxyFactory
@@ -32,7 +32,7 @@
         ob = self.traversePath(request, ob, path)
 
         while 1:
-            adapter = queryAdapter(ob, IBrowserPublisher)
+            adapter = IBrowserPublisher(ob, None)
             if adapter is None:
                 return ob
             ob, path = adapter.browserDefault(request)


=== Zope3/src/zope/app/publication/zopepublication.py 1.37 => 1.38 ===
--- Zope3/src/zope/app/publication/zopepublication.py:1.37	Fri Mar  5 17:09:13 2004
+++ Zope3/src/zope/app/publication/zopepublication.py	Sat Mar  6 12:48:52 2004
@@ -15,7 +15,7 @@
 import logging
 
 from zope.component import queryView, queryDefaultViewName
-from zope.component import queryService, queryAdapter
+from zope.component import queryService
 from zope.app.services.servicenames import ErrorLogging, Authentication
 from ZODB.POSException import ConflictError
 
@@ -281,7 +281,7 @@
             # See if there's an IExceptionSideEffects adapter for the
             # exception
             try:
-                adapter = queryAdapter(exception, IExceptionSideEffects)
+                adapter = IExceptionSideEffects(exception, None)
             except:
                 tryToLogException(
                     'Exception while getting IExceptionSideEffects adapter')