Adjust to new zope.pagetemplate macros lookup.

doc/CHANGES.rst

@@ -19,6 +19,8 @@ Bugs Fixed
 Features Added
 ++++++++++++++
 
+- Adjust to new zope.pagetemplate macros lookup.
+
 - Optimized the `OFS.Traversable.getPhysicalPath` method to avoid excessive
   amounts of method calls.
 

setup.py

@@ -87,7 +87,7 @@ setup(name='Zope2',
       'zope.interface',
       'zope.lifecycleevent',
       'zope.location',
-      'zope.pagetemplate',
+      'zope.pagetemplate >= 3.6.1',
       'zope.processlifetime',
       'zope.proxy',
       'zope.ptresource',

src/Products/PageTemplates/PageTemplate.py

@@ -59,7 +59,7 @@ class PageTemplate(ExtensionClass.Base,
                 'Page Template %s has errors: %s' % (
                 self.id, self._v_errors
                 ))
-        return self._v_macros
+        return self._v_program.macros
 
     # these methods are reimplemented or duplicated here because of
     # different call signatures in the Zope 2 world