diff options
Diffstat (limited to 'mako')
| -rw-r--r-- | mako/exceptions.py | 29 | ||||
| -rw-r--r-- | mako/runtime.py | 5 |
2 files changed, 22 insertions, 12 deletions
diff --git a/mako/exceptions.py b/mako/exceptions.py index daba4fd..d59d868 100644 --- a/mako/exceptions.py +++ b/mako/exceptions.py @@ -73,14 +73,18 @@ class RichTraceback(object): """ def __init__(self, error=None, traceback=None): - (self.source, self.lineno) = ("", 0) + self.source, self.lineno = "", 0 if error is None or traceback is None: - t, value, traceback = sys.exc_info() - self.error = value or t - else: - self.error = error + t, value, tback = sys.exc_info() + + if error is None: + error = value or t + + if traceback is None: + traceback = tback + self.error = error self.records = self._init(traceback) if isinstance(self.error, (CompileException, SyntaxException)): @@ -88,11 +92,10 @@ class RichTraceback(object): self.source = self.error.source self.lineno = self.error.lineno self._has_source = True - self.reverse_records = [r for r in self.records] - self.reverse_records.reverse() - self.init_message() + + self._init_message() - def init_message(self): + def _init_message(self): """Find a unicode representation of self.error""" try: self.message = unicode(self.error) @@ -118,13 +121,17 @@ class RichTraceback(object): """return a list of 4-tuple traceback records (i.e. normal python format) with template-corresponding lines remapped to the originating template """ - return self._get_reformatted_records(self.records) + return list(self._get_reformatted_records(self.records)) @property + def reverse_records(self): + return reversed(self.records) + + @property def reverse_traceback(self): """return the same data as traceback, except in reverse order """ - return self._get_reformatted_records(self.reverse_records) + return list(self._get_reformatted_records(self.reverse_records)) def _init(self, trcback): """format a traceback from sys.exc_info() into 7-item tuples, containing diff --git a/mako/runtime.py b/mako/runtime.py index 95828b4..19d79de 100644 --- a/mako/runtime.py +++ b/mako/runtime.py @@ -430,6 +430,9 @@ def _render_error(template, context, error): if context._outputting_as_unicode: context._buffer_stack[:] = [util.FastEncodingBuffer(unicode=True)] else: - context._buffer_stack[:] = [util.FastEncodingBuffer(error_template.output_encoding, error_template.encoding_errors)] + context._buffer_stack[:] = [util.FastEncodingBuffer( + error_template.output_encoding, + error_template.encoding_errors)] + context._with_template = error_template error_template.render_context(context, error=error) |