diff options
| author | ianb <devnull@localhost> | 2006-10-20 15:09:35 +0000 |
|---|---|---|
| committer | ianb <devnull@localhost> | 2006-10-20 15:09:35 +0000 |
| commit | 7fc6e346d9b322105ff1d412ac7ad771103f31df (patch) | |
| tree | cf54def4314373c452c0d11df64c9335ad65d0c0 | |
| parent | 0309aed5f854a375d944191358ccfab9191c5034 (diff) | |
| download | paste-7fc6e346d9b322105ff1d412ac7ad771103f31df.tar.gz | |
Quote the frame name aka function name, which contains <> in Genshi
| -rw-r--r-- | docs/news.txt | 3 | ||||
| -rw-r--r-- | paste/exceptions/formatter.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/news.txt b/docs/news.txt index 2b8df75..b072e2e 100644 --- a/docs/news.txt +++ b/docs/news.txt @@ -28,6 +28,9 @@ svn trunk * Added automatic cleanup of old sessions for ``paste.session``, from Amir Salihefendic. +* Quote the function name in tracebacks in the exception formatter; + Genshi has function names that use ``<>``. + 0.9.9 ----- diff --git a/paste/exceptions/formatter.py b/paste/exceptions/formatter.py index 907475a..e1fadbe 100644 --- a/paste/exceptions/formatter.py +++ b/paste/exceptions/formatter.py @@ -246,11 +246,12 @@ class HTMLFormatter(TextFormatter): def format_combine_lines(self, lines): return '<br>\n'.join(lines) def format_source_line(self, filename, frame): + name = self.quote(frame.name or '?') return 'Module <span class="module" title="%s">%s</span>:<b>%s</b> in <code>%s</code>' % ( filename, frame.modname or '?', frame.lineno or '?', - frame.name or '?') + name) return 'File %r, line %s in <tt>%s</tt>' % ( - filename, frame.lineno, frame.name) + filename, frame.lineno, name) def format_long_source(self, source, long_source): q_long_source = str2html(long_source, False, 4, True) q_source = str2html(source, True, 0, False) |