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

No other functional changes.

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

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
 

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"