From a5acfe23fadc4772fdd6fd63091c32621b94d710 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Mon, 7 Jan 2013 13:03:33 +0100 Subject: [PATCH] Move mediagoblin.db.sql.extratypes to mediagoblin.db.extratypes No other functional changes. --- mediagoblin/db/{sql => }/extratypes.py | 0 mediagoblin/db/models.py | 2 +- mediagoblin/db/models_v0.py | 2 +- mediagoblin/media_types/image/models.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename mediagoblin/db/{sql => }/extratypes.py (100%) 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 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" -- 2.25.1