diff --git a/velruse/app/__init__.py b/velruse/app/__init__.py index d4d8d83..c95a650 100644 --- a/velruse/app/__init__.py +++ b/velruse/app/__init__.py @@ -80,8 +80,10 @@ def default_setup(config): specified then an in-memory storage backend will be used. """ - # from pyramid.session import UnencryptedCookieSessionFactoryConfig - from pyramid.session import SignedCookieSessionFactory + try: + from pyramid.session import SignedCookieSessionFactory as SessionFactory + except ImportError: + from pyramid.session import UnencryptedCookieSessionFactoryConfig as SessionFactory log.info('Using an unencrypted cookie-based session. This can be ' 'changed by pointing the "velruse.setup" setting at a different ' @@ -102,8 +104,7 @@ def default_setup(config): else: secret = ''.join('%02x' % x for x in os.urandom(16)) log.info('autogenerated session secret: %s', secret) - factory = SignedCookieSessionFactory( - secret, cookie_name=cookie_name) + factory = SessionFactory(secret, cookie_name=cookie_name) config.set_session_factory(factory) # setup backing storage