diff options
| author | Michael Merickel <michael@merickel.org> | 2016-09-19 21:01:34 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-09-19 21:01:34 -0500 |
| commit | d6ae7b50aba59c112c02444bd6bdda9eea058afa (patch) | |
| tree | c8bac3e32e5ecee29da67bb8f416a94a7b857c1f | |
| parent | 4acd85dc98fb2a43eae54d2116cc4bf383157269 (diff) | |
| parent | 24e1b3b0bd5e15ab13d7c89ef9a291f1b464724c (diff) | |
| download | pyramid-d6ae7b50aba59c112c02444bd6bdda9eea058afa.tar.gz pyramid-d6ae7b50aba59c112c02444bd6bdda9eea058afa.tar.bz2 pyramid-d6ae7b50aba59c112c02444bd6bdda9eea058afa.zip | |
Merge branch 'pr/2750'
| -rw-r--r-- | pyramid/httpexceptions.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pyramid/httpexceptions.py b/pyramid/httpexceptions.py index e76f43c8a..054917dfa 100644 --- a/pyramid/httpexceptions.py +++ b/pyramid/httpexceptions.py @@ -98,7 +98,10 @@ be forwarded to its :class:`~pyramid.response.Response` superclass: a plain-text override of the default ``detail`` ``headers`` - a list of (k,v) header pairs + a list of (k,v) header pairs, or a dict, to be added to the + response; use the content_type='application/json' kwarg and other + similar kwargs to to change properties of the response supported by the + :class:`pyramid.response.Response` superclass ``comment`` a plain-text additional information which is |