4 files changed, 9 insertions, 15 deletions
diff --git a/mediagoblin/db/migration_tools.py b/mediagoblin/db/migration_tools.py
index 149aab4d..32e09797 100644
--- a/mediagoblin/db/migration_tools.py
+++ b/mediagoblin/db/migration_tools.py
@@ -19,11 +19,8 @@ import logging
 import os
 import pkg_resources
 
-from alembic import command
 from alembic.config import Config
-from alembic.migration import MigrationContext
 
-from mediagoblin.db.base import Base
 from mediagoblin.tools.common import simple_printer
 from sqlalchemy import Table
 from sqlalchemy.sql import select
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index f00c8019..ee49250a 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -31,7 +31,7 @@ import pytz
 import dateutil.tz
 from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger,
                         Integer, Unicode, UnicodeText, DateTime,
-                        ForeignKey, Date, Index)
+                        ForeignKey, Date)
 from sqlalchemy.exc import ProgrammingError
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.sql import and_
@@ -42,10 +42,8 @@ from mediagoblin.tools import crypto
 from mediagoblin.db.extratypes import JSONEncoded, MutationDict
 from mediagoblin.db.migration_tools import (
     RegisterMigration, inspect_table, replace_table_hack, model_iteration_hack)
-from mediagoblin.db.models import (MediaEntry, Collection, Comment, User,
-                                   Privilege, Generator, LocalUser, Location,
-                                   Client, RequestToken, AccessToken)
-from mediagoblin.db.extratypes import JSONEncoded, MutationDict
+from mediagoblin.db.models import (
+    MediaEntry, Collection, Comment, User, Privilege, LocalUser, Location)
 
 
 MIGRATIONS = {}
diff --git a/mediagoblin/db/migrations/env.py b/mediagoblin/db/migrations/env.py
index 48b32ad6..5019c60f 100644
--- a/mediagoblin/db/migrations/env.py
+++ b/mediagoblin/db/migrations/env.py
@@ -1,5 +1,4 @@
 from alembic import context
-from sqlalchemy import engine_from_config, pool
 from logging.config import fileConfig
 
 # this is the Alembic Config object, which provides
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index e65690fe..e4ac8143 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -22,11 +22,10 @@ TODO: indexes on foreignkeys, where useful.
 import logging
 import datetime
 
-from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \
-        Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \
-        SmallInteger, Date, types, Float
-from sqlalchemy.orm import relationship, backref, with_polymorphic, validates, \
-        class_mapper
+from sqlalchemy import (
+    Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
+    UniqueConstraint, PrimaryKeyConstraint, SmallInteger, Date, Float)
+from sqlalchemy.orm import relationship, backref, class_mapper
 from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.sql import and_
 from sqlalchemy.sql.expression import desc
@@ -35,7 +34,7 @@ from sqlalchemy.util import memoized_property
 
 from mediagoblin.db.extratypes import (PathTupleWithSlashes, JSONEncoded,
                                        MutationDict)
-from mediagoblin.db.base import Base, DictReadAttrProxy, FakeCursor
+from mediagoblin.db.base import Base, DictReadAttrProxy
 from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, \
         CollectionMixin, CollectionItemMixin, ActivityMixin, TextCommentMixin, \
         CommentingMixin
@@ -49,6 +48,7 @@ from pytz import UTC
 
 _log = logging.getLogger(__name__)
 
+
 class GenericModelReference(Base):
     """
     Represents a relationship to any model that is defined with a integer pk