Commit 82379258 authored by Evan Simpson's avatar Evan Simpson

Don't cache macro errors, and cook even if text hasn't changed.

parent 8bf40628
......@@ -87,7 +87,7 @@
HTML- and XML-based template objects using TAL, TALES, and METAL.
"""
__version__='$Revision: 1.10 $'[11:-2]
__version__='$Revision: 1.11 $'[11:-2]
import os, sys, traceback, pprint
from TAL.TALParser import TALParser
......@@ -119,7 +119,6 @@ class PageTemplate:
self.content_type = str(content_type)
if hasattr(text, 'read'):
text = text.read()
if self._text <> text:
self.write(text)
def pt_getContext(self):
......@@ -169,6 +168,7 @@ class PageTemplate:
errend = find(text, '-->')
if errend >= 0:
text = text[errend + 4:]
if self._text != text:
self._text = text
self._cook()
......@@ -179,17 +179,13 @@ class PageTemplate:
try:
return self.pt_render(source=1)
except:
tb = traceback.extract_tb(sys.exc_info()[2])
tb.reverse()
self._v_errors = ["Macro expansion failed",
"%s: %s" % sys.exc_info()[:2],
] + map(str, tb)
return ('%s\n Macro expansion failed\n %s\n-->\n%s' %
(self._error_start, "%s: %s" % sys.exc_info()[:2],
self._text) )
if self.html():
return ('%s\n %s\n-->\n%s' % (self._error_start,
join(self._v_errors, '\n '),
self._text))
return self._text
def _cook(self):
"""Compile the TAL and METAL statments.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment