[Checkins] SVN: five.pt/trunk/src/five/pt/patches.py Make macros for TTW ZPTs work, including partial refactor of the Chameleon template fetching logic on the patch

[Leonardo Rochael Almeida]

Log message for revision 120526:
  Make macros for TTW ZPTs work, including partial refactor of the Chameleon template fetching logic on the patch

Changed:
  U   five.pt/trunk/src/five/pt/patches.py

-=-
Modified: five.pt/trunk/src/five/pt/patches.py
===================================================================
--- five.pt/trunk/src/five/pt/patches.py	2011-02-23 00:33:43 UTC (rev 120525)
+++ five.pt/trunk/src/five/pt/patches.py	2011-02-23 09:45:41 UTC (rev 120526)
@@ -69,26 +69,30 @@
     return BoundPageTemplate(template, instance)
 
 
-def call_template(self, *args, **kw):
+def _get_five_pt_template(self):
     template = getattr(self, '_v_template', _marker)
     if template is _marker or self._text != template.source:
         self._v_template = template = BaseTemplate(self._text, keep_source=True)
 
-    return template(self, *args, **kw)
+    return template
 
+def _get_five_pt_template_wrapped(self):
+    template = _get_five_pt_template(self)
 
-def call_template_and_wrap(self, *args, **kw):
-    template = getattr(self, '_v_template', _marker)
-    if template is _marker or self._text != template.source:
-        self._v_template = template = BaseTemplate(self._text, keep_source=True)
-
     if IAcquirer.providedBy(template):
         template = template.__of__(aq_parent(self))
     else:
         template = ImplicitAcquisitionWrapper(template, aq_parent(self))
 
+    return template
+
+def call_template(self, *args, **kw):
+    template = self._get_five_pt_template()
     return template(self, *args, **kw)
 
+def call_template_and_wrap(self, *args, **kw):
+    template = self._get_five_pt_template_wrapped()
+    return template(self, *args, **kw)
 
 def call_template_file(self, *args, **kw):
     template = getattr(self, '_v_template', _marker)
@@ -104,6 +108,10 @@
 
 
 def get_macros(self):
+    template = self._get_five_pt_template_wrapped()
+    return template.macros
+
+def get_macros_file(self):
     template = getattr(self, '_v_template', _marker)
     if template is _marker:
         self._v_template = template = BaseTemplateFile(self.filename)
@@ -116,10 +124,12 @@
 FiveViewPageTemplateFile.__get__ = get_bound_template
 ZopeViewPageTemplateFile.__get__ = get_bound_template
 PageTemplate.__call__ = call_template
+PageTemplate._get_five_pt_template = _get_five_pt_template
 PageTemplate.macros = ComputedAttribute(get_macros, 1)
 PageTemplateFile.__call__ = call_template_file
-PageTemplateFile.macros = property(get_macros)
-ZopePageTemplate.__call__ = call_template_and_wrap
+PageTemplateFile.macros = property(get_macros_file)
+ZopePageTemplate._get_five_pt_template_wrapped = _get_five_pt_template_wrapped
+ZopePageTemplate._bindAndExec = call_template_and_wrap
 ZopePageTemplate.macros = ComputedAttribute(get_macros, 1)
 
 try: