Add request method to return db session

src/wfrp/character/application.py

@@ -5,8 +5,6 @@
 from sqlalchemy.orm import sessionmaker
 from zope.sqlalchemy import register
 
-from wfrp.character.security import SecurityPolicy
-
 DBSession = scoped_session(sessionmaker())
 register(DBSession)
 Base = declarative_base()
@@ -18,6 +16,9 @@ def configure_app(global_config, **settings):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
     config = Configurator(settings=settings)
+    # to prevent circular imports
+    from wfrp.character.security import SecurityPolicy
+
     config.set_security_policy(
         SecurityPolicy(
             secret=settings["wfrp.character.secret"],
@@ -26,10 +27,15 @@ def configure_app(global_config, **settings):
     config.include("wfrp.character.routes")
     config.add_static_view("static", "wfrp.character:static")
     config.add_static_view("static_deform", "deform:static")
+    config.add_request_method(dbsession, reify=True)
     config.scan()
     return config
 
 
+def dbsession(request):
+    return DBSession
+
+
 def main(global_config, **settings):
     """Return a Pyramid WSGI application."""
     config = configure_app(global_config, **settings)

tests/conftest.py

@@ -9,6 +9,7 @@
 
 from wfrp.character.application import Base
 from wfrp.character.application import DBSession
+from wfrp.character.application import dbsession
 from wfrp.character.models.character import Character
 
 register(CharacterFactory)
@@ -18,6 +19,7 @@
 def testapp():
     engine = engine_from_config({"sqlalchemy.url": "sqlite:///:memory:"}, "sqlalchemy.")
     config = testing.setUp()
+    config.add_request_method(dbsession, reify=True)
     config.include("pyramid_chameleon")
     config.include("wfrp.character.routes")
     config.add_static_view("static", "wfrp.character:static")