Only conditionally import Session in db/util.py

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 515fd6cdea5dfebcdbc1807c6498accfe3843108..7c026691ed32688196d772b0450b587879da1fce 100644 (file)
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -17,10 +17,14 @@
 import sys
 
 from mediagoblin import mg_globals as mgg
-from mediagoblin.db.base import Session
 from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
 from mediagoblin.gmg_commands.dbupdate import gather_database_data
 
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
+if not DISABLE_GLOBALS:
+    from mediagoblin.db.base import Session
+
 ##########################
 # Random utility functions
 ##########################