diff options
-rw-r--r-- | mediagoblin/db/extratypes.py (renamed from mediagoblin/db/sql/extratypes.py) | 0 | ||||
-rw-r--r-- | mediagoblin/db/models.py | 2 | ||||
-rw-r--r-- | mediagoblin/db/models_v0.py | 2 | ||||
-rw-r--r-- | mediagoblin/media_types/image/models.py | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/db/sql/extratypes.py b/mediagoblin/db/extratypes.py index f2304af0..f2304af0 100644 --- a/mediagoblin/db/sql/extratypes.py +++ b/mediagoblin/db/extratypes.py diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 4450e38d..54f9abbc 100644 --- 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 06f87d28..742c4652 100644 --- 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 f54a0762..0ac9caab 100644 --- 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" |