aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-03-29 22:31:51 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-03-29 23:23:57 +0200
commit19535af4e57b479642cbe6e08eb8e9590a996bf4 (patch)
tree490e57850918147a4fe3849b388bc82f3b5c4e37
parentc0fddc63e883345f2d9308b2fc78459cc87dd9cb (diff)
downloadmediagoblin-19535af4e57b479642cbe6e08eb8e9590a996bf4.tar.lz
mediagoblin-19535af4e57b479642cbe6e08eb8e9590a996bf4.tar.xz
mediagoblin-19535af4e57b479642cbe6e08eb8e9590a996bf4.zip
Fix some simple errors.
-rw-r--r--mediagoblin/db/sql/convert.py4
-rw-r--r--mediagoblin/db/sql/models_v0.py5
2 files changed, 5 insertions, 4 deletions
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 024dab33..97f29bfc 100644
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -19,8 +19,8 @@ from copy import copy
from mediagoblin.init import setup_global_and_app_config
from mediagoblin.db.sql.base import Session
-from mediagoblin.db.sql.models_0 import Base_v0
-from mediagoblin.db.sql.models_0 import (User, MediaEntry, MediaComment,
+from mediagoblin.db.sql.models_v0 import Base_v0
+from mediagoblin.db.sql.models_v0 import (User, MediaEntry, MediaComment,
Tag, MediaTag, MediaFile, MediaAttachmentFile, MigrationData,
ImageData, VideoData)
from mediagoblin.db.sql.open import setup_connection_and_db_from_config as \
diff --git a/mediagoblin/db/sql/models_v0.py b/mediagoblin/db/sql/models_v0.py
index c67129af..475d3f08 100644
--- a/mediagoblin/db/sql/models_v0.py
+++ b/mediagoblin/db/sql/models_v0.py
@@ -24,8 +24,9 @@ import sys
from sqlalchemy import (
Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
- UniqueConstraint, PrimaryKeyConstraint, SmallInteger)
-from sqlalchemy.orm import relationship
+ UniqueConstraint, PrimaryKeyConstraint, SmallInteger, Float)
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship, backref
from sqlalchemy.orm.collections import attribute_mapped_collection
from sqlalchemy.sql.expression import desc
from sqlalchemy.ext.associationproxy import association_proxy