From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 30 Nov 2014 20:04:20 +0000 (-0600)
Subject: Move the scoped_session, sessionmaker imports
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=202675212001b54b5d6f00af19dcac86cf904ddf;p=mediagoblin.git

Move the scoped_session, sessionmaker imports
---

diff --git a/mediagoblin/db/base.py b/mediagoblin/db/base.py
index e594bd95..c3c34763 100644
--- a/mediagoblin/db/base.py
+++ b/mediagoblin/db/base.py
@@ -16,12 +16,12 @@
 
 
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import scoped_session, sessionmaker, object_session
 from sqlalchemy import inspect
 
 from mediagoblin.tools.transition import DISABLE_GLOBALS
 
 if not DISABLE_GLOBALS:
+    from sqlalchemy.orm import scoped_session, sessionmaker
     Session = scoped_session(sessionmaker())