summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-02-27 16:28:08 -0500
committerMichael Merickel <michael@merickel.org>2014-02-27 16:28:08 -0500
commit1098ac88253ab7bee225bbb620381d3c7c4f99af (patch)
treed28850da987b18f04b94def3b86edb1b87e37783
parent89dc4659eedfe75bada6d131722fbb00f1bbc49f (diff)
downloadpyramid-1098ac88253ab7bee225bbb620381d3c7c4f99af.tar.gz
pyramid-1098ac88253ab7bee225bbb620381d3c7c4f99af.tar.bz2
pyramid-1098ac88253ab7bee225bbb620381d3c7c4f99af.zip
79-char line widths!
-rw-r--r--pyramid/session.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/pyramid/session.py b/pyramid/session.py
index 9fe2add60..ea7a5628c 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -165,10 +165,10 @@ def BaseCookieSessionFactory(
Parameters:
``serializer``
- An object with two methods: ``loads`` and ``dumps``. The ``loads`` method
- should accept bytes and return a Python object. The ``dumps`` method
- should accept a Python object and return bytes. A ``ValueError`` should
- be raised for malformed inputs.
+ An object with two methods: ``loads`` and ``dumps``. The ``loads``
+ method should accept bytes and return a Python object. The ``dumps``
+ method should accept a Python object and return bytes. A ``ValueError``
+ should be raised for malformed inputs.
``cookie_name``
The name of the cookie used for sessioning. Default: ``'session'``.
@@ -473,8 +473,8 @@ def UnencryptedCookieSessionFactoryConfig(
deprecated(
'UnencryptedCookieSessionFactoryConfig',
'The UnencryptedCookieSessionFactoryConfig callable is deprecated as of '
- 'Pyramid 1.5. Use ``pyramid.session.SignedCookieSessionFactory`` instead. '
- 'Caveat: Cookies generated using SignedCookieSessionFactory are not '
+ 'Pyramid 1.5. Use ``pyramid.session.SignedCookieSessionFactory`` instead.'
+ ' Caveat: Cookies generated using SignedCookieSessionFactory are not '
'compatible with cookies generated using UnencryptedCookieSessionFactory, '
'so existing user session data will be destroyed if you switch to it.'
)
@@ -578,11 +578,11 @@ def SignedCookieSessionFactory(
while rendering a view. Default: ``True``.
``serializer``
- An object with two methods: ``loads`` and ``dumps``. The ``loads`` method
- should accept bytes and return a Python object. The ``dumps`` method
- should accept a Python object and return bytes. A ``ValueError`` should
- be raised for malformed inputs. If a serializer is not passed, the
- :class:`pyramid.session.PickleSerializer` serializer will be used.
+ An object with two methods: ``loads`` and ``dumps``. The ``loads``
+ method should accept bytes and return a Python object. The ``dumps``
+ method should accept a Python object and return bytes. A ``ValueError``
+ should be raised for malformed inputs. If a serializer is not passed,
+ the :class:`pyramid.session.PickleSerializer` serializer will be used.
.. versionadded: 1.5a3
"""
@@ -591,7 +591,7 @@ def SignedCookieSessionFactory(
signed_serializer = SignedSerializer(
secret,
- salt,
+ salt,
hashalg,
serializer=serializer,
)