[Zope-Checkins] SVN: Zope/trunk/ In PageTemplate.pt_errors accept the check_macro_expansion argument.

[Maurits van Rees]

Log message for revision 129011:
  In PageTemplate.pt_errors accept the check_macro_expansion argument.
  
  This is added for compatibility with zope.pagetemplate 4.0.0.
  The argument is ignored.
  See LP #732972.
  
  This merges r129010 from branch 2.13.
  

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

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2013-01-04 10:00:25 UTC (rev 129010)
+++ Zope/trunk/doc/CHANGES.rst	2013-01-04 10:05:13 UTC (rev 129011)
@@ -11,6 +11,10 @@
 Bugs Fixed
 ++++++++++
 
+- In ``PageTemplate.pt_errors`` accept the ``check_macro_expansion`` argument.
+  This is added for compatibility with ``zope.pagetemplate`` 4.0.0.
+  The argument is ignored (LP #732972).
+
 - Ensure that the ``WSGIPublisher`` begins and ends an *interaction*
   at the request/response barrier. This is required for instance for
   the ``checkPermission`` call to function without an explicit

Modified: Zope/trunk/src/Products/PageTemplates/PageTemplate.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/PageTemplate.py	2013-01-04 10:00:25 UTC (rev 129010)
+++ Zope/trunk/src/Products/PageTemplates/PageTemplate.py	2013-01-04 10:05:13 UTC (rev 129011)
@@ -79,7 +79,10 @@
                    showtal=showtal)
 
 
-    def pt_errors(self, namespace={}):
+    def pt_errors(self, namespace={}, check_macro_expansion=None):
+        # The check_macro_expansion argument is added for
+        # compatibility with zope.pagetemplate 4.0.0.  The argument is
+        # ignored.  See LP #732972.
         self._cook_check()
         err = self._v_errors
         if err: