[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/Views/Browser - ZPTPageEdit.py:1.1.2.3 ZPTPageEval.py:1.1.2.4

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	ZPTPageEdit.py ZPTPageEval.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/Content/ZPTPage/Views/Browser/ZPTPageEdit.py 1.1.2.2 => 1.1.2.3 ===
 
 from Zope.App.Formulator.Form import Form
-from Zope.PageTemplate.PageTemplateFile import PageTemplateFile
+from Zope.App.PageTemplate import ViewPageTemplateFile
 
 
 class ZPTPageEdit(Form):
@@ -30,4 +30,4 @@
                    'source code of this ZPT Page.')
 
     _fieldViewNames = ['SourceFieldView']
-    template = PageTemplateFile('edit.pt')
+    template = ViewPageTemplateFile('edit.pt')


=== Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/Views/Browser/ZPTPageEval.py 1.1.2.3 => 1.1.2.4 ===
 # 
 ##############################################################################
-"""
-    Define view component for ZPT page eval results.
+"""Define view component for ZPT page eval results.
+
+$Id$
 """
 
 from Zope.Publisher.Browser.AttributePublisher import AttributePublisher
+from Zope.Proxy.ContextWrapper import getWrapperContainer
 
-
-class ZPTPageEval( AttributePublisher ):
+class ZPTPageEval(AttributePublisher):
 
     __implements__ = AttributePublisher.__implements__
     
-    def __init__( self, zptpage ):
+    def __init__(self, zptpage):
         self._zptpage = zptpage
 
 
-    def getContext( self ):
+    def getContext(self):
         return self._zptpage
     
 
-    def pt_getContext(self, inst=None, REQUEST=None):
-        #root = self.getPhysicalRoot()
-        c = {'template': self.getContext(),
-             'nothing': None,
-             }
-        if inst is not None:
-            c['context'] = inst.getContext()
-            c['view'] = inst
-            c['views'] = ViewMapper(inst.getContext(), REQUEST)
-        return c
-
-
-    def index(self, inst=None, REQUEST=None, **kw):
+    def index(self, REQUEST=None, **kw):
         """Call a Page Template"""
-        bound_names = {}
-        bound_names.update(self.pt_getContext(inst, REQUEST))
-        bound_names['options'] = kw
-        bound_names['request'] = REQUEST
-
-        try:
-            self.REQUEST.getResponse().setHeader('content-type',
-                                            self.getContext().content_type)
-        except AttributeError:
-            pass
-
-        # Execute the template in a new security context.
-        self.getContext()._cook()
-        return self.getContext().pt_render(bound_names)
-
 
-    def document_src(self, REQUEST=None):
-        """Return expanded document source."""
+        template = self.getContext()
 
         if REQUEST is not None:
-            REQUEST.getResponse().setHeader('Content-Type', self.content_type)
-        return self.read()
+            REQUEST.getResponse().setHeader('content-type',
+                                            template.content_type)
+
+        return template.render(REQUEST, **kw)