diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-11-30 15:08:14 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-12-03 15:40:57 -0600 |
| commit | 5cbdb15cdbe2254ead37917f00769b2d77bd60a8 (patch) | |
| tree | 05d85f5148f210581f3685d629b299f6f60608cd | |
| parent | c060353e35ab3cf084be01e2cf9808fa26b907f9 (diff) | |
| download | mediagoblin-5cbdb15cdbe2254ead37917f00769b2d77bd60a8.tar.lz mediagoblin-5cbdb15cdbe2254ead37917f00769b2d77bd60a8.tar.xz mediagoblin-5cbdb15cdbe2254ead37917f00769b2d77bd60a8.zip | |
Only conditionally import Session in db/util.py
| -rw-r--r-- | mediagoblin/db/util.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index 515fd6cd..7c026691 100644 --- 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 ########################## |