diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-20 14:04:27 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-20 14:04:27 -0400 |
| commit | 0264cc0c3d4ca091d4d5c8bd0c2fda38a3f8a0c7 (patch) | |
| tree | 41479dfa730206adebc19958b51e92f410e45dfe /docs/api | |
| parent | 7d0b6ade3c77e4d512f193f86e074b94dc0ed8af (diff) | |
| parent | da295e4336fe04c11640ce8857adb214deaf2a93 (diff) | |
| download | pyramid-0264cc0c3d4ca091d4d5c8bd0c2fda38a3f8a0c7.tar.gz pyramid-0264cc0c3d4ca091d4d5c8bd0c2fda38a3f8a0c7.tar.bz2 pyramid-0264cc0c3d4ca091d4d5c8bd0c2fda38a3f8a0c7.zip | |
Merge branch 'feature.bad-csrf-token-exception'
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/exceptions.rst | 2 | ||||
| -rw-r--r-- | docs/api/httpexceptions.rst | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/api/exceptions.rst b/docs/api/exceptions.rst index ab158f18d..0c630571f 100644 --- a/docs/api/exceptions.rst +++ b/docs/api/exceptions.rst @@ -5,6 +5,8 @@ .. automodule:: pyramid.exceptions + .. autoclass:: BadCSRFToken + .. autoclass:: PredicateMismatch .. autoclass:: Forbidden diff --git a/docs/api/httpexceptions.rst b/docs/api/httpexceptions.rst index 6a08d1048..b50f10beb 100644 --- a/docs/api/httpexceptions.rst +++ b/docs/api/httpexceptions.rst @@ -7,9 +7,9 @@ .. attribute:: status_map - A mapping of integer status code to exception class (eg. the - integer "401" maps to - :class:`pyramid.httpexceptions.HTTPUnauthorized`). + A mapping of integer status code to HTTP exception class (eg. the integer + "401" maps to :class:`pyramid.httpexceptions.HTTPUnauthorized`). All + mapped exception classes are children of :class:`pyramid.httpexceptions`, .. autofunction:: exception_response |