[Zope-Checkins] SVN: Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py queryDefaultName isn't deprecated in 3.3, so I start using it instead.

[Lennart Regebro]

Log message for revision 67648:
  queryDefaultName isn't deprecated in 3.3, so I start using it instead.
  

Changed:
  U   Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py

-=-
Modified: Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py
===================================================================
--- Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py	2006-04-27 15:07:44 UTC (rev 67647)
+++ Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py	2006-04-27 15:08:11 UTC (rev 67648)
@@ -24,6 +24,7 @@
 from zope.component.interfaces import ComponentLookupError
 from zope.event import notify
 from zope.app.publication.interfaces import EndRequestEvent
+from zope.app.publisher.browser import queryDefaultViewName
 from zope.publisher.interfaces import IPublishTraverse
 from zope.publisher.interfaces import NotFound
 from zope.component.interfaces import IDefaultViewName
@@ -116,15 +117,7 @@
         # Zope 3.2 still uses IDefaultView name when it
         # registeres default views, even though it's
         # deprecated. So we handle that here:
-        try:
-            sm = getSiteManager(self.context)
-        except ComponentLookupError:
-            # Context has no context (typically Application).
-            # Just look up the global site manager
-            sm = getSiteManager()
-        default_name = sm.adapters.lookup(
-            map(providedBy, (self.context, request)),
-            IDefaultViewName)
+        default_name = queryDefaultViewName(self.context, request)
         if default_name is not None:
             return self.context, (default_name,)
         return self.context, ()