6 files changed, 4 insertions, 21 deletions
diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/base.py
index 3530011e..3530011e 100644
--- a/mediagoblin/db/sql/base.py
+++ b/mediagoblin/db/base.py
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 54f9abbc..ea915ae5 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -32,9 +32,8 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.util import memoized_property
 
 from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded
-from mediagoblin.db.sql.base import Base, DictReadAttrProxy
+from mediagoblin.db.base import Base, DictReadAttrProxy, Session
 from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, MediaCommentMixin, CollectionMixin, CollectionItemMixin
-from mediagoblin.db.sql.base import Session
 
 # It's actually kind of annoying how sqlalchemy-migrate does this, if
 # I understand it right, but whatever.  Anyway, don't remove this :P
diff --git a/mediagoblin/db/models_v0.py b/mediagoblin/db/models_v0.py
index 742c4652..ec51a1f5 100644
--- a/mediagoblin/db/models_v0.py
+++ b/mediagoblin/db/models_v0.py
@@ -32,8 +32,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.util import memoized_property
 
 from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded
-from mediagoblin.db.sql.base import GMGTableBase
-from mediagoblin.db.sql.base import Session
+from mediagoblin.db.base import GMGTableBase, Session
 
 
 Base_v0 = declarative_base(cls=GMGTableBase)
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 11b2dc97..d976acd8 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -18,7 +18,7 @@
 from sqlalchemy import create_engine
 import logging
 
-from mediagoblin.db.sql.base import Base, Session
+from mediagoblin.db.base import Base, Session
 from mediagoblin import mg_globals
 
 _log = logging.getLogger(__name__)
diff --git a/mediagoblin/db/sql/__init__.py b/mediagoblin/db/sql/__init__.py
deleted file mode 100644
index 621845ba..00000000
--- a/mediagoblin/db/sql/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 32dd0884..2017cfc0 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import sys
-from mediagoblin.db.sql.base import Session
+from mediagoblin.db.base import Session
 from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
 
 from mediagoblin.tools.common import simple_printer