summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-05 23:56:17 -0400
committerChris McDonough <chrism@plope.com>2014-05-05 23:56:17 -0400
commit50d2b85e5e2795c2b129a86e8d388909fbc2835f (patch)
treeb59dd141e473fae4c059d35c9b04b98466fe958d
parent7423971bf8aaa5fd205778820d91a6c7e3cea1bd (diff)
parent87ee3d32213325f6fa712cd1772a53a60fd72e42 (diff)
downloadpyramid-50d2b85e5e2795c2b129a86e8d388909fbc2835f.tar.gz
pyramid-50d2b85e5e2795c2b129a86e8d388909fbc2835f.tar.bz2
pyramid-50d2b85e5e2795c2b129a86e8d388909fbc2835f.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--pyramid/request.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/request.py b/pyramid/request.py
index f8514066e..6318049ee 100644
--- a/pyramid/request.py
+++ b/pyramid/request.py
@@ -59,8 +59,8 @@ class CallbackMethodsMixin(object):
called if an exception happens in application code, or if the
response object returned by :term:`view` code is invalid.
- All response callbacks are called *after* the
- :class:`pyramid.events.NewResponse` event is sent.
+ All response callbacks are called *after* the tweens and
+ *before* the :class:`pyramid.events.NewResponse` event is sent.
Errors raised by callbacks are not handled specially. They
will be propagated to the caller of the :app:`Pyramid`