aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/sql/convert.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-03-20 12:32:11 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-03-20 12:45:40 +0100
commit39fd817ab8c4745187e5e1992d2f2866de38e2c2 (patch)
tree7bfade89d75650d1f63de63319b29e49b4d0a7be /mediagoblin/db/sql/convert.py
parentdf7c405845e1fe6436083e7781abb3d1b178624f (diff)
downloadmediagoblin-39fd817ab8c4745187e5e1992d2f2866de38e2c2.tar.lz
mediagoblin-39fd817ab8c4745187e5e1992d2f2866de38e2c2.tar.xz
mediagoblin-39fd817ab8c4745187e5e1992d2f2866de38e2c2.zip
Import "Base" from base instead of models.
Import the "Base" class for models from db.sql.base instead of db.sql.models.
Diffstat (limited to 'mediagoblin/db/sql/convert.py')
-rw-r--r--mediagoblin/db/sql/convert.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index d1492977..232e424f 100644
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -19,7 +19,8 @@ from copy import copy
from mediagoblin.init import setup_global_and_app_config, setup_database
from mediagoblin.db.mongo.util import ObjectId
-from mediagoblin.db.sql.models import (Base, User, MediaEntry, MediaComment,
+from mediagoblin.db.sql.base import Base, Session
+from mediagoblin.db.sql.models import (User, MediaEntry, MediaComment,
Tag, MediaTag, MediaFile, MediaAttachmentFile, MigrationData)
from mediagoblin.media_types.image.models import ImageData
from mediagoblin.media_types.video.models import VideoData
@@ -27,7 +28,6 @@ from mediagoblin.db.sql.open import setup_connection_and_db_from_config as \
sql_connect
from mediagoblin.db.mongo.open import setup_connection_and_db_from_config as \
mongo_connect
-from mediagoblin.db.sql.base import Session
obj_id_table = dict()