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.

doc/CHANGES.rst

@@ -11,6 +11,10 @@ http://docs.zope.org/zope2/releases/.
 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

src/Products/PageTemplates/PageTemplate.py

@@ -79,7 +79,10 @@ class PageTemplate(ExtensionClass.Base,
                    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: