Merge branch 'univenv'

EliAndrewC · Jul 3, 2014 · 99181b3 · 99181b3
2 parents 9fedb53 + 10fa4ee
commit 99181b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sideboard/lib/sa/__init__.py b/sideboard/lib/sa/__init__.py
@@ -161,7 +161,6 @@ class _SessionInitializer(type):
     def __new__(cls, name, bases, attrs):
         SessionClass = type.__new__(cls, name, bases, attrs)
         if hasattr(SessionClass, 'engine'):
-            print('modules', SessionClass.__module__, [bc for bc in _SessionInitializer._base_classes])
             if not hasattr(SessionClass, 'BaseClass'):
                 for module, bc in _SessionInitializer._base_classes.items():
                     if module == SessionClass.__module__:

diff --git a/sideboard/tests/__init__.py b/sideboard/tests/__init__.py
@@ -44,5 +44,6 @@ def patch_session(Session, request):
     db_path = '/tmp/{}.db'.format(name)
     Session.engine = sqlalchemy.create_engine('sqlite+pysqlite:///' + db_path)
     event.listen(Session.engine, 'connect', lambda conn, record: conn.execute('pragma foreign_keys=ON'))
-    Session.session_factory = sessionmaker(bind=Session.engine, autoflush=False, autocommit=False)
+    Session.session_factory = sessionmaker(bind=Session.engine, autoflush=False, autocommit=False,
+                                           query_cls=Session.QuerySubclass)
     Session.initialize_db(drop=True)