diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-11-30 14:04:20 -0600 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-12-03 15:40:57 -0600 |
commit | 202675212001b54b5d6f00af19dcac86cf904ddf (patch) | |
tree | e91813dd40927674b3519c110cb91facd1091125 | |
parent | e248e1429a832c7b38094fe08155f163ffc6b9b2 (diff) | |
download | mediagoblin-202675212001b54b5d6f00af19dcac86cf904ddf.tar.lz mediagoblin-202675212001b54b5d6f00af19dcac86cf904ddf.tar.xz mediagoblin-202675212001b54b5d6f00af19dcac86cf904ddf.zip |
Move the scoped_session, sessionmaker imports
-rw-r--r-- | mediagoblin/db/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
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()) |