summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorianb <devnull@localhost>2007-09-06 21:18:31 +0000
committerianb <devnull@localhost>2007-09-06 21:18:31 +0000
commite327a17504bb6a42d59cb10cf072dd0a59bb87a6 (patch)
tree0b170124dec97f52102f0476a749780e605618de
parentd000b53b615c9f1c4b7a34f9138990780d7891a3 (diff)
downloadpaste-e327a17504bb6a42d59cb10cf072dd0a59bb87a6.tar.gz
exc_info should be passed up in intercept_output (if it is not, exceptions sometimes won't propogate upward properly)
-rw-r--r--docs/news.txt6
-rw-r--r--paste/wsgilib.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/news.txt b/docs/news.txt
index 0801214..4709dcb 100644
--- a/docs/news.txt
+++ b/docs/news.txt
@@ -3,6 +3,12 @@ News
.. contents::
+svn trunk
+---------
+
+* Fix problem with ``paste.wsgilib.intercept_output`` and passing up
+ exceptions.
+
1.4.1
-----
diff --git a/paste/wsgilib.py b/paste/wsgilib.py
index c7a5e05..9960587 100644
--- a/paste/wsgilib.py
+++ b/paste/wsgilib.py
@@ -530,7 +530,7 @@ def intercept_output(environ, application, conditional=None,
def replacement_start_response(status, headers, exc_info=None):
if conditional is not None and not conditional(status, headers):
data.append(None)
- return start_response(status, headers)
+ return start_response(status, headers, exc_info)
if data:
data[:] = []
data.append(status)