diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-20 16:29:12 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-20 16:29:12 -0400 |
| commit | d7550c4f8ae023f9a00d6293ba3c94ca14b412f2 (patch) | |
| tree | bc3634c3b2c3a647b43cbe715b968997c63c3b52 /docs/api | |
| parent | 777112d521e337fefc2e0c217add7ac283d087b3 (diff) | |
| parent | 2edbe1b61c7ace0a13f0d7242f333982a6fc9fde (diff) | |
| download | pyramid-d7550c4f8ae023f9a00d6293ba3c94ca14b412f2.tar.gz pyramid-d7550c4f8ae023f9a00d6293ba3c94ca14b412f2.tar.bz2 pyramid-d7550c4f8ae023f9a00d6293ba3c94ca14b412f2.zip | |
fix merge conflict and prevent warning from showing up during testing (dont import ITemplateRenderer)
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/exceptions.rst | 2 | ||||
| -rw-r--r-- | docs/api/httpexceptions.rst | 6 | ||||
| -rw-r--r-- | docs/api/session.rst | 8 |
3 files changed, 11 insertions, 5 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 diff --git a/docs/api/session.rst b/docs/api/session.rst index 31bc196ad..dde9d20e9 100644 --- a/docs/api/session.rst +++ b/docs/api/session.rst @@ -5,12 +5,16 @@ .. automodule:: pyramid.session - .. autofunction:: UnencryptedCookieSessionFactoryConfig - .. autofunction:: signed_serialize .. autofunction:: signed_deserialize .. autofunction:: check_csrf_token + .. autofunction:: SignedCookieSessionFactory + + .. autofunction:: UnencryptedCookieSessionFactoryConfig + + .. autofunction:: BaseCookieSessionFactory + |