[Zope-Checkins] SVN: Zope/trunk/ Revert c122683, zope.pagetemplate got corrected

[Hanno Schlichting]

Log message for revision 122870:
  Revert c122683, zope.pagetemplate got corrected
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/setup.py
  U   Zope/trunk/src/Products/PageTemplates/PageTemplate.py

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2011-09-21 10:30:19 UTC (rev 122869)
+++ Zope/trunk/doc/CHANGES.rst	2011-09-21 10:35:09 UTC (rev 122870)
@@ -19,8 +19,6 @@
 Features Added
 ++++++++++++++
 
-- Adjust to new zope.pagetemplate macros lookup.
-
 - Optimized the `OFS.Traversable.getPhysicalPath` method to avoid excessive
   amounts of method calls.
 

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2011-09-21 10:30:19 UTC (rev 122869)
+++ Zope/trunk/setup.py	2011-09-21 10:35:09 UTC (rev 122870)
@@ -87,7 +87,7 @@
       'zope.interface',
       'zope.lifecycleevent',
       'zope.location',
-      'zope.pagetemplate >= 3.6.1',
+      'zope.pagetemplate',
       'zope.processlifetime',
       'zope.proxy',
       'zope.ptresource',

Modified: Zope/trunk/src/Products/PageTemplates/PageTemplate.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/PageTemplate.py	2011-09-21 10:30:19 UTC (rev 122869)
+++ Zope/trunk/src/Products/PageTemplates/PageTemplate.py	2011-09-21 10:35:09 UTC (rev 122870)
@@ -59,7 +59,7 @@
                 'Page Template %s has errors: %s' % (
                 self.id, self._v_errors
                 ))
-        return self._v_program.macros
+        return self._v_macros
 
     # these methods are reimplemented or duplicated here because of
     # different call signatures in the Zope 2 world