diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-20 14:01:47 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-20 14:01:47 -0400 |
| commit | da295e4336fe04c11640ce8857adb214deaf2a93 (patch) | |
| tree | 41479dfa730206adebc19958b51e92f410e45dfe /docs/quick_tutorial/sessions/tutorial | |
| parent | 6b0889cc8f3711d5f77cb663f8f2fa432eb3ad06 (diff) | |
| parent | 7d0b6ade3c77e4d512f193f86e074b94dc0ed8af (diff) | |
| download | pyramid-da295e4336fe04c11640ce8857adb214deaf2a93.tar.gz pyramid-da295e4336fe04c11640ce8857adb214deaf2a93.tar.bz2 pyramid-da295e4336fe04c11640ce8857adb214deaf2a93.zip | |
fix merge conflict
Diffstat (limited to 'docs/quick_tutorial/sessions/tutorial')
| -rw-r--r-- | docs/quick_tutorial/sessions/tutorial/__init__.py | 6 |
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() |