[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Container/Views/Browser - Adder.py:1.1.2.7 Contents.py:1.1.2.5

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Container/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv26429/lib/python/Zope/App/OFS/Container/Views/Browser

Modified Files:
      Tag: Zope-3x-branch
	Adder.py Contents.py 
Log Message:
This all started with wanting to be able to use url;view in a ZPT path. :)

That lead me to:

- Massive traversal refactoring.

  Namespace handling is now centralized in Zope.App.Traversing. 

- ZPT refactoring, including some renaming that touches pretty much everything. :)

  - The application specific ZPT support was moved into
    Zope.App.PageTemplate. 

  - To get page template files (for use in views):

    from Zope.App.PageTemplate import ViewPageTemplateFile

  - Fixed up security so that ZPT expressions only have access to 
    safe builtins and so that modules namespace does imports safely.

  - Got ZPTPage working!

- renaming url to absolute_url and got absolute_url to work in paths.

- Cleaned up the (as yet unused) RestrictedInterpreter module in
  Zope.Security. In particular, changed to use a separate
  RestrictedBuiltins module.



=== Zope3/lib/python/Zope/App/OFS/Container/Views/Browser/Adder.py 1.1.2.6 => 1.1.2.7 ===
 # 
 ##############################################################################
+"""Define adder component for folders.
+
+$Id$
 """
-    Define adder component for folders.
-"""
+
 from Zope.Publisher.Browser.AttributePublisher import AttributePublisher
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
-from Zope.PageTemplate.PageTemplateFile import PageTemplateFile
+from Zope.App.PageTemplate import ViewPageTemplateFile
 from Zope.ComponentArchitecture import createObject
 from Zope.App.OFS.Services.AddableService import getAddableContent
 from Zope.ComponentArchitecture.ContextDependent import ContextDependent
@@ -63,5 +65,5 @@
 
         return self.confirmed( type_name=type_name, id=id )
 
-    index = PageTemplateFile('add.pt')
-    confirmed = PageTemplateFile('add_confirmed.pt')
+    index = ViewPageTemplateFile('add.pt')
+    confirmed = ViewPageTemplateFile('add_confirmed.pt')


=== Zope3/lib/python/Zope/App/OFS/Container/Views/Browser/Contents.py 1.1.2.4 => 1.1.2.5 ===
 from Zope.ComponentArchitecture.ContextDependent import ContextDependent
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
-from Zope.PageTemplate.PageTemplateFile import PageTemplateFile
+from Zope.App.PageTemplate import ViewPageTemplateFile
 from Zope.App.OFS.Container.IContainer import IContainer
 
 class Contents(ContextDependent, AttributePublisher):
@@ -71,6 +71,6 @@
     def listContentInfo(self):
         return map(self._extractContentInfo, self.getContext().objectItems())
 
-    index = PageTemplateFile('main.pt')
-    confirmRemoved = PageTemplateFile('remove_confirmed.pt')
+    index = ViewPageTemplateFile('main.pt')
+    confirmRemoved = ViewPageTemplateFile('remove_confirmed.pt')