Move mediagoblin.db.sql.extratypes to mediagoblin.db.extratypes

No other functional changes.

diff --git a/mediagoblin/db/sql/extratypes.py b/mediagoblin/db/extratypes.py
similarity index 100%
rename from mediagoblin/db/sql/extratypes.py
rename to mediagoblin/db/extratypes.py

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 4450e38d984a1aba4c5322369ae8bf41206b77a6..54f9abbc2e22328f642fcc8a4bde9f6bd9d41089 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -31,7 +31,7 @@ from sqlalchemy.sql.expression import desc
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.util import memoized_property
 
-from mediagoblin.db.sql.extratypes import PathTupleWithSlashes, JSONEncoded
+from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded
 from mediagoblin.db.sql.base import Base, DictReadAttrProxy
 from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, MediaCommentMixin, CollectionMixin, CollectionItemMixin
 from mediagoblin.db.sql.base import Session

diff --git a/mediagoblin/db/models_v0.py b/mediagoblin/db/models_v0.py
index 06f87d288480419d1bb32535bf42bf7d79cee201..742c465217f6d28e8952cb031f10935df35e2d45 100644 (file)
--- a/mediagoblin/db/models_v0.py
+++ b/mediagoblin/db/models_v0.py
@@ -31,7 +31,7 @@ from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.util import memoized_property
 
-from mediagoblin.db.sql.extratypes import PathTupleWithSlashes, JSONEncoded
+from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded
 from mediagoblin.db.sql.base import GMGTableBase
 from mediagoblin.db.sql.base import Session
 

diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py
index f54a0762d29f3650cc43381882336c599acc7015..0ac9caabbad4b87b74fc5944045c447ef0a8cc8c 100644 (file)
--- a/mediagoblin/media_types/image/models.py
+++ b/mediagoblin/media_types/image/models.py
@@ -20,7 +20,7 @@ from mediagoblin.db.sql.base import Base
 from sqlalchemy import (
     Column, Integer, Float, ForeignKey)
 from sqlalchemy.orm import relationship, backref
-from mediagoblin.db.sql.extratypes import JSONEncoded
+from mediagoblin.db.extratypes import JSONEncoded
 
 
 BACKREF_NAME = "image__media_data"