[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication/VFS - Publication.py:1.1.4.2

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	Publication.py 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/App/ZopePublication/VFS/Publication.py 1.1.4.1 => 1.1.4.2 ===
 from Zope.App.ZopePublication.ZopePublication import ZopePublication
 
-from Zope.ComponentArchitecture import getRequestView
+from Zope.ComponentArchitecture import getView
 from Zope.Publisher.Exceptions import NotFound
 from Zope.Publisher.mapply import mapply
 
@@ -29,7 +29,7 @@
 
     def callObject(self, request, ob):
 
-        view = getRequestView(ob, 'vfs', request, self) 
+        view = getView(ob, 'vfs', request, self) 
 
         if view is not self:
             method = getattr(view, request.method)