Import "Base" from base instead of models.

Import the "Base" class for models from db.sql.base instead
of db.sql.models.

diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index d14929775fd5f0adfe2f80744996bcc840cd3278..232e424fe1ff198a6769f310b6c84dca83701bec 100644 (file)
--- 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()

diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py
index 9819b4689b80960b7edfc12d3e855f881e9addf2..7362b1c588fe37dc67e11e9ebbf61c5f0a82da77 100644 (file)
--- a/mediagoblin/db/sql/open.py
+++ b/mediagoblin/db/sql/open.py
@@ -18,8 +18,7 @@
 from sqlalchemy import create_engine
 import logging
 
-from mediagoblin.db.sql.base import Session
-from mediagoblin.db.sql.models import Base
+from mediagoblin.db.sql.base import Base, Session
 
 
 class DatabaseMaster(object):

diff --git a/mediagoblin/media_types/ascii/models.py b/mediagoblin/media_types/ascii/models.py
index 03907339e0e16bbb7176ac853ec3972829bdbacd..043a858ac79d91b2a583b46a661be68057d26ad6 100644 (file)
--- a/mediagoblin/media_types/ascii/models.py
+++ b/mediagoblin/media_types/ascii/models.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mediagoblin.db.sql.models import Base
+from mediagoblin.db.sql.base import Base
 
 from sqlalchemy import (
     Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,

diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py
index f333cbb88a676ca4b89c921cabae43dd1b6a3687..5b9edb50f9344c0490dc9230485fc1ebc6921945 100644 (file)
--- a/mediagoblin/media_types/image/models.py
+++ b/mediagoblin/media_types/image/models.py
@@ -1,4 +1,4 @@
-from mediagoblin.db.sql.models import Base
+from mediagoblin.db.sql.base import Base
 
 from sqlalchemy import (
     Column, Integer, Float, ForeignKey)

diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py
index 0d064f5f818430b77e5f56ff1381847a980b48c6..cf42b7c83a4ffb49a254318184205ad79414c762 100644 (file)
--- a/mediagoblin/media_types/video/models.py
+++ b/mediagoblin/media_types/video/models.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mediagoblin.db.sql.models import Base
+from mediagoblin.db.sql.base import Base
 
 from sqlalchemy import (
     Column, Integer, SmallInteger, ForeignKey)