diff options
| author | Maurits van Rees <maurits@vanrees.org> | 2013-01-04 09:52:23 +0000 |
|---|---|---|
| committer | Maurits van Rees <maurits@vanrees.org> | 2013-01-04 09:52:23 +0000 |
| commit | 7fb9021a86ad1fb2bd5636061242f6f1950b0c45 (patch) | |
| tree | 35cfaaa01dd5a3f1bc0138c92b08e7b569d3490c | |
| parent | 79a70be9a0e025bf5341aca97c586b47b869d2a2 (diff) | |
| download | zope-pagetemplate-7fb9021a86ad1fb2bd5636061242f6f1950b0c45.tar.gz | |
PageTemplateTracebackSupplement does not pass check_macro_expansion=False
in case of an old template that does not accept this argument.
Refs LP#732972
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | src/zope/pagetemplate/pagetemplate.py | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 1735513..d428c5e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,7 +5,11 @@ CHANGES 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) diff --git a/src/zope/pagetemplate/pagetemplate.py b/src/zope/pagetemplate/pagetemplate.py index f69e7b0..055208b 100644 --- a/src/zope/pagetemplate/pagetemplate.py +++ b/src/zope/pagetemplate/pagetemplate.py @@ -262,6 +262,10 @@ class PageTemplateTracebackSupplement(object): 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) |