summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-10-06 11:58:36 -0700
committerGitHub <noreply@github.com>2016-10-06 11:58:36 -0700
commit5286a1ef7db26f30c0f8c11ee6f96fd497ce4052 (patch)
tree61ef957a700f5e6219e15e28e68b80e8a92bf8f2
parent488800c9fb285c748cf05cf56f0d42c723cbf764 (diff)
parent4c5e14f3a843f588e380c865ac362bcc017b69a6 (diff)
downloadpyramid-5286a1ef7db26f30c0f8c11ee6f96fd497ce4052.tar.gz
pyramid-5286a1ef7db26f30c0f8c11ee6f96fd497ce4052.tar.bz2
pyramid-5286a1ef7db26f30c0f8c11ee6f96fd497ce4052.zip
Merge pull request #2792 from stevepiercy/master
Add pyramid_nacl_session to session factories
-rw-r--r--CHANGES.txt3
-rw-r--r--docs/narr/sessions.rst9
2 files changed, 12 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 77129bdb1..19708fde3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -97,6 +97,9 @@ Deprecations
Documentation Changes
---------------------
+- Add pyramid_nacl_session to session factories.
+ See https://github.com/Pylons/pyramid/issues/2791
+
- Update HACKING.txt from stale branch that was never merged to master.
See https://github.com/Pylons/pyramid/pull/2782
diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst
index a1319e45f..5b24201a9 100644
--- a/docs/narr/sessions.rst
+++ b/docs/narr/sessions.rst
@@ -157,6 +157,12 @@ The following session factories exist at the time of this writing.
======================= ======= =============================
Session Factory Backend Description
======================= ======= =============================
+pyramid_nacl_session_ PyNaCl_ Defines an encrypting,
+ pickle-based cookie
+ serializer, using PyNaCl to
+ generate the symmetric
+ encryption for the cookie
+ state.
pyramid_redis_sessions_ Redis_ Server-side session library
for Pyramid, using Redis for
storage.
@@ -165,6 +171,9 @@ pyramid_beaker_ Beaker_ Session factory for Pyramid
sessioning system.
======================= ======= =============================
+.. _pyramid_nacl_session: https://pypi.python.org/pypi/pyramid_nacl_session
+.. _PyNaCl: https://pynacl.readthedocs.io/en/latest/secret/
+
.. _pyramid_redis_sessions: https://pypi.python.org/pypi/pyramid_redis_sessions
.. _Redis: http://redis.io/