[Zope-Checkins] CVS: Zope/lib/python/OFS - ObjectManager.py:1.141.6.6

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv31940

Modified Files:
      Tag: ComponentArchitecture-branch
	ObjectManager.py 
Log Message:
Changed name "_publish" to "_default" and made default presentation
components act more like adapters.


=== Zope/lib/python/OFS/ObjectManager.py 1.141.6.5 => 1.141.6.6 ===
             if not FTPPublish.isImplementedBy(v):
                 v = ComponentArchitecture.getPresentation(
-                    v, '_publish', FTPPublish, v)
+                    v, '_default', FTPPublish, v)
             m = getattr(v, 'manage_FTPstat', None)
             if m is not None:
                 stat=marshal.loads(m(REQUEST))
@@ -742,13 +742,14 @@
                     # Waaa. unrestrictedTraverse calls us with a fake REQUEST.
                     # There is proabably a better fix for this.
                     raise KeyError, name
-        subob = ComponentArchitecture.getPresentation(
-            subob, '_publish', BrowserPublish, subob)
+        if not BrowserPublish.isImplementedBy(subob):
+            subob = ComponentArchitecture.getPresentation(
+                subob, '_default', BrowserPublish, subob)
         return subob
 
     def _browser_default(self, request):
         p = ComponentArchitecture.getPresentation(
-            self, '_publish', BrowserPublish, None)
+            self, '_default', BrowserPublish, None)
         if p is None:
             return (self, ())
         else:
@@ -757,11 +758,12 @@
     def _ftp_traverse(self, request, name):
         subob = self._getOb(name, None)
         if subob is not None:
-            subob = ComponentArchitecture.getPresentation(
-                subob, '_publish', FTPPublish, subob)
+            if not FTPPublish.isImplementedBy(subob):
+                subob = ComponentArchitecture.getPresentation(
+                    subob, '_default', FTPPublish, subob)
             return subob
         p = ComponentArchitecture.getPresentation(
-            self, '_publish', FTPPublish, None)
+            self, '_default', FTPPublish, None)
         if p is not None:
             return p._ftp_traverse(request, name)
         return getattr(self, name)
@@ -769,11 +771,12 @@
     def _webdav_traverse(self, request, name):
         subob = self._getOb(name, None)
         if subob is not None:
-            subob = ComponentArchitecture.getPresentation(
-                subob, '_publish', WebDAVPublish, subob)
+            if not WebDAVPublish.isImplementedBy(subob):
+                subob = ComponentArchitecture.getPresentation(
+                    subob, '_default', WebDAVPublish, subob)
             return subob
         p = ComponentArchitecture.getPresentation(
-            self, '_publish', WebDAVPublish, None)
+            self, '_default', WebDAVPublish, None)
         if p is not None:
             return p._webdav_traverse(request, name)
         return getattr(self, name)
@@ -832,7 +835,7 @@
                 getURLOf(self.aq_parent) + '/manage_main')
         return ''
 
-    def __bobo_traverse__(self, request, name):
+    def _browser_traverse(self, request, name):
         if name[:3] == '(p)':
             return ComponentArchitecture.getPresentation(
                 self, name[3:], BrowserPublish)
@@ -846,7 +849,7 @@
         else:
             raise 'NotFound', name
 
-    def __browser_default__(self, request):
+    def _browser_default(self, request):
         raise 'NotFound'
 
 
@@ -882,3 +885,4 @@
         return ObjectManager.all_meta_types(self, interfaces)
 
 Globals.default__class_init__(ObjectManager)
+