summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/sessions
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-20 16:29:12 -0400
committerChris McDonough <chrism@plope.com>2013-10-20 16:29:12 -0400
commitd7550c4f8ae023f9a00d6293ba3c94ca14b412f2 (patch)
treebc3634c3b2c3a647b43cbe715b968997c63c3b52 /docs/quick_tutorial/sessions
parent777112d521e337fefc2e0c217add7ac283d087b3 (diff)
parent2edbe1b61c7ace0a13f0d7242f333982a6fc9fde (diff)
downloadpyramid-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/quick_tutorial/sessions')
-rw-r--r--docs/quick_tutorial/sessions/tutorial/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/quick_tutorial/sessions/tutorial/__init__.py b/docs/quick_tutorial/sessions/tutorial/__init__.py
index ecf57bb32..9ddc2e1b1 100644
--- a/docs/quick_tutorial/sessions/tutorial/__init__.py
+++ b/docs/quick_tutorial/sessions/tutorial/__init__.py
@@ -1,9 +1,9 @@
from pyramid.config import Configurator
-from pyramid.session import UnencryptedCookieSessionFactoryConfig
+from pyramid.session import SignedCookieSessionFactory
def main(global_config, **settings):
- my_session_factory = UnencryptedCookieSessionFactoryConfig(
+ my_session_factory = SignedCookieSessionFactory(
'itsaseekreet')
config = Configurator(settings=settings,
session_factory=my_session_factory)
@@ -11,4 +11,4 @@ def main(global_config, **settings):
config.add_route('home', '/')
config.add_route('hello', '/howdy')
config.scan('.views')
- return config.make_wsgi_app() \ No newline at end of file
+ return config.make_wsgi_app()