diff options
| author | John Anderson <sontek@gmail.com> | 2015-02-07 11:14:24 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-02-07 11:14:24 -0800 |
| commit | ce7c06a044756422ba3741614515940d2b230e28 (patch) | |
| tree | 3373caf57660f003ebeb8e8954d87cba885ab89a /docs/narr/sessions.rst | |
| parent | 03a0d79306b2846313df1983a721d5cccf4ec3ce (diff) | |
| parent | b17fa8b19da6e8272515588abbd2299f03bc2942 (diff) | |
| download | pyramid-ce7c06a044756422ba3741614515940d2b230e28.tar.gz pyramid-ce7c06a044756422ba3741614515940d2b230e28.tar.bz2 pyramid-ce7c06a044756422ba3741614515940d2b230e28.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into allow_class_method_directly
Conflicts:
pyramid/compat.py
Diffstat (limited to 'docs/narr/sessions.rst')
| -rw-r--r-- | docs/narr/sessions.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst index 8da743a01..5c103405a 100644 --- a/docs/narr/sessions.rst +++ b/docs/narr/sessions.rst @@ -44,7 +44,7 @@ It is digitally signed, however, and thus its data cannot easily be tampered with. You can configure this session factory in your :app:`Pyramid` application -by using the :meth:`pyramid.config.Configurator.set_session_factory`` method. +by using the :meth:`pyramid.config.Configurator.set_session_factory` method. .. code-block:: python :linenos: @@ -380,7 +380,7 @@ Checking CSRF Tokens Manually ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In request handling code, you can check the presence and validity of a CSRF -token with :func:`pyramid.session.check_csrf_token(request)``. If the token is +token with :func:`pyramid.session.check_csrf_token`. If the token is valid, it will return ``True``, otherwise it will raise ``HTTPBadRequest``. Optionally, you can specify ``raises=False`` to have the check return ``False`` instead of raising an exception. |