diff options
| author | ianb <devnull@localhost> | 2005-05-04 17:24:11 +0000 |
|---|---|---|
| committer | ianb <devnull@localhost> | 2005-05-04 17:24:11 +0000 |
| commit | ba75c00479b63703fd1d99f52073cdccd6027908 (patch) | |
| tree | bc8e23203ce7f49a536db5ccee21fa94fd1fb062 /paste/exceptions | |
| parent | d87fc5af2806c826c2e37c894cd40b97dfea98cd (diff) | |
| download | paste-ba75c00479b63703fd1d99f52073cdccd6027908.tar.gz | |
Simplified wsgi variables; put in exception information about exceptions raised by supplements; removed empty CGI variables
Diffstat (limited to 'paste/exceptions')
| -rw-r--r-- | paste/exceptions/collector.py | 1 | ||||
| -rw-r--r-- | paste/exceptions/formatter.py | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/paste/exceptions/collector.py b/paste/exceptions/collector.py index b8a14a3..1c10d0f 100644 --- a/paste/exceptions/collector.py +++ b/paste/exceptions/collector.py @@ -357,7 +357,6 @@ class ExceptionCollector: extra_data=extra_data) if etype is ImportError: extra_data[('important', 'sys.path')] = [sys.path] - print "XX", extra_data return result limit = 200 diff --git a/paste/exceptions/formatter.py b/paste/exceptions/formatter.py index bf8e1fb..794123f 100644 --- a/paste/exceptions/formatter.py +++ b/paste/exceptions/formatter.py @@ -54,6 +54,9 @@ class AbstractFormatter: lines.append(self.format_sup_warning(warning)) if sup.info: lines.extend(self.format_sup_info(sup.info)) + if frame.supplement_exception: + lines.append('Exception in supplement:') + lines.append(self.quote_long(frame.supplement_exception)) filename = frame.filename if filename and self.trim_source_paths: for path, repl in self.trim_source_paths: @@ -109,6 +112,8 @@ class TextFormatter(AbstractFormatter): def quote(self, s): return s + def quote_long(self, s): + return s def emphasize(self, s): return s def format_sup_object(self, name): @@ -169,6 +174,8 @@ class HTMLFormatter(TextFormatter): def quote(self, s): return html_quote(s) + def quote_long(self, s): + return '<pre>%s</pre>' % self.quote(s) def emphasize(self, s): return '<b>%s</b>' % s def format_sup_url(self, url): |