[Checkins] SVN: zope.pagetemplate/trunk/ PageTemplateTracebackSupplement does not pass check_macro_expansion=False

[Maurits van Rees]

Log message for revision 129009:
  PageTemplateTracebackSupplement does not pass check_macro_expansion=False
  in case of an old template that does not accept this argument.
  Refs LP#732972
  

Changed:
  U   zope.pagetemplate/trunk/CHANGES.txt
  U   zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py

-=-
Modified: zope.pagetemplate/trunk/CHANGES.txt
===================================================================
--- zope.pagetemplate/trunk/CHANGES.txt	2013-01-03 21:49:51 UTC (rev 129008)
+++ zope.pagetemplate/trunk/CHANGES.txt	2013-01-04 09:52:23 UTC (rev 129009)
@@ -5,7 +5,11 @@
 4.0.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- PageTemplateTracebackSupplement does not pass
+  check_macro_expansion=False in case of an old template that does not
+  accept this argument.
+  Refs LP#732972
+  [maurits]
 
 
 4.0.0 (2012-12-13)

Modified: zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py
===================================================================
--- zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py	2013-01-03 21:49:51 UTC (rev 129008)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py	2013-01-04 09:52:23 UTC (rev 129009)
@@ -262,6 +262,10 @@
     def __init__(self, pt, namespace):
         self.manageable_object = pt
         self.warnings = []
-        e = pt.pt_errors(namespace, check_macro_expansion=False)
+        try:
+            e = pt.pt_errors(namespace, check_macro_expansion=False)
+        except TypeError:
+            # Old page template.
+            e = pt.pt_errors(namespace)
         if e:
             self.warnings.extend(e)