aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2013-01-07 13:03:33 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2013-01-07 13:10:02 +0100
commita5acfe23fadc4772fdd6fd63091c32621b94d710 (patch)
tree50a3c0476810d6463e4ed394c9853f11c02a058c
parentb0c8328e547288028e7e43f0ceb1fa9f7c8dac4a (diff)
downloadmediagoblin-a5acfe23fadc4772fdd6fd63091c32621b94d710.tar.lz
mediagoblin-a5acfe23fadc4772fdd6fd63091c32621b94d710.tar.xz
mediagoblin-a5acfe23fadc4772fdd6fd63091c32621b94d710.zip
Move mediagoblin.db.sql.extratypes to mediagoblin.db.extratypes
No other functional changes.
-rw-r--r--mediagoblin/db/extratypes.py (renamed from mediagoblin/db/sql/extratypes.py)0
-rw-r--r--mediagoblin/db/models.py2
-rw-r--r--mediagoblin/db/models_v0.py2
-rw-r--r--mediagoblin/media_types/image/models.py2
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"