summaryrefslogtreecommitdiff
path: root/docs/quick_tour
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-20 16:15:34 -0400
committerChris McDonough <chrism@plope.com>2013-10-20 16:15:34 -0400
commit2a6e6b3776b07589f8bbaaf4c72419f2bdf5e218 (patch)
tree5074ba1d0d378b91b640e234c9c9267fcbe06015 /docs/quick_tour
parent6c98b17ed9aadbe485c6473c3f76e1b2b529dc78 (diff)
parent0264cc0c3d4ca091d4d5c8bd0c2fda38a3f8a0c7 (diff)
downloadpyramid-2a6e6b3776b07589f8bbaaf4c72419f2bdf5e218.tar.gz
pyramid-2a6e6b3776b07589f8bbaaf4c72419f2bdf5e218.tar.bz2
pyramid-2a6e6b3776b07589f8bbaaf4c72419f2bdf5e218.zip
Merge branch 'master' into fix.basic-authentication-encodings
Diffstat (limited to 'docs/quick_tour')
-rw-r--r--docs/quick_tour/package/hello_world/__init__.py4
-rw-r--r--docs/quick_tour/package/hello_world/init.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/quick_tour/package/hello_world/__init__.py b/docs/quick_tour/package/hello_world/__init__.py
index 6e66bf40a..4a4fbec30 100644
--- a/docs/quick_tour/package/hello_world/__init__.py
+++ b/docs/quick_tour/package/hello_world/__init__.py
@@ -1,7 +1,7 @@
from pyramid.config import Configurator
from pyramid_jinja2 import renderer_factory
# Start Sphinx Include 1
-from pyramid.session import UnencryptedCookieSessionFactoryConfig
+from pyramid.session import SignedCookieSessionFactory
# End Sphinx Include 1
from hello_world.models import get_root
@@ -16,7 +16,7 @@ def main(global_config, **settings):
settings.setdefault('jinja2.i18n.domain', 'hello_world')
# Start Sphinx Include 2
- my_session_factory = UnencryptedCookieSessionFactoryConfig('itsaseekreet')
+ my_session_factory = SignedCookieSessionFactory('itsaseekreet')
config = Configurator(root_factory=get_root, settings=settings,
session_factory=my_session_factory)
# End Sphinx Include 2
diff --git a/docs/quick_tour/package/hello_world/init.py b/docs/quick_tour/package/hello_world/init.py
index 9d7ec43d8..5b5f6a118 100644
--- a/docs/quick_tour/package/hello_world/init.py
+++ b/docs/quick_tour/package/hello_world/init.py
@@ -1,7 +1,7 @@
from pyramid.config import Configurator
from pyramid_jinja2 import renderer_factory
# Start Sphinx 1
-from pyramid.session import UnencryptedCookieSessionFactoryConfig
+from pyramid.session import SignedCookieSessionFactory
# End Sphinx 1
from hello_world.models import get_root
@@ -22,7 +22,7 @@ def main(global_config, **settings):
# End Include
# Start Sphinx Include 2
- my_session_factory = UnencryptedCookieSessionFactoryConfig('itsaseekreet')
+ my_session_factory = SignedCookieSessionFactory('itsaseekreet')
config = Configurator(session_factory=my_session_factory)
# End Sphinx Include 2