[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS - ContainerTraverser.py:1.1.2.3 FolderAdder.py:1.1.2.5 FolderContents.py:1.1.2.3

[Fred Drake Jr]

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

Modified Files:
      Tag: Zope-3x-branch
	ContainerTraverser.py FolderAdder.py FolderContents.py 
Log Message:
Presentation --> View

=== Zope3/lib/python/Zope/App/OFS/ContainerTraverser.py 1.1.2.2 => 1.1.2.3 ===
 
 """
-    Define presentation component for folder contents.
+    Define view component for folder contents.
 """
 
 import os
@@ -16,7 +16,7 @@
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
 from Zope.Publisher.Exceptions import NotFound
 from IContainer import IReadContainer
-from Zope.ComponentArchitecture import getPresentation
+from Zope.ComponentArchitecture import getView
 
 
 class ContainerTraverser:
@@ -30,7 +30,7 @@
     def browser_traverse(self, request, name):
         c = self._c
         if name[-5:] == ';view':
-            p = getPresentation(c, name[:-5], IBrowserPublisher)
+            p = getView(c, name[:-5], IBrowserPublisher)
             if p is None:
                 raise NotFound(c, name, request)
             else:
@@ -44,7 +44,7 @@
         """
         """
         c = self._c
-        p = getPresentation(c, '', IBrowserPublisher)
+        p = getView(c, '', IBrowserPublisher)
         if p is None:
-            raise PresentationNotFound
+            raise NotFound
         return p.browser_default(request)


=== Zope3/lib/python/Zope/App/OFS/FolderAdder.py 1.1.2.4 => 1.1.2.5 ===
 from Zope.PageTemplate.PageTemplateFile import PageTemplateFile
 from Zope.App.ZMI.Addable import getAddables
-from Zope.ComponentArchitecture import createObject, getPresentation
+from Zope.ComponentArchitecture import createObject
 
 class FolderAdderError( Exception ):
     pass


=== Zope3/lib/python/Zope/App/OFS/FolderContents.py 1.1.2.2 => 1.1.2.3 ===
 
 """
-    Define presentation component for folder contents.
+    Define view component for folder contents.
 """
 
 import os