aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/db/migration_tools.py (renamed from mediagoblin/db/sql/migration_tools.py)0
-rw-r--r--mediagoblin/db/migrations.py2
-rw-r--r--mediagoblin/gmg_commands/dbupdate.py2
-rw-r--r--mediagoblin/plugins/oauth/migrations.py2
-rw-r--r--mediagoblin/tests/test_sql_migrations.py2
5 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/db/sql/migration_tools.py b/mediagoblin/db/migration_tools.py
index e5380a3b..e5380a3b 100644
--- a/mediagoblin/db/sql/migration_tools.py
+++ b/mediagoblin/db/migration_tools.py
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 469d2874..80ec5269 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -23,7 +23,7 @@ from sqlalchemy.exc import ProgrammingError
from sqlalchemy.ext.declarative import declarative_base
from migrate.changeset.constraint import UniqueConstraint
-from mediagoblin.db.sql.migration_tools import RegisterMigration, inspect_table
+from mediagoblin.db.migration_tools import RegisterMigration, inspect_table
from mediagoblin.db.models import MediaEntry, Collection, User
MIGRATIONS = {}
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index dadb79c7..65b3f922 100644
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -19,7 +19,7 @@ import logging
from sqlalchemy.orm import sessionmaker
from mediagoblin.db.open import setup_connection_and_db_from_config
-from mediagoblin.db.sql.migration_tools import MigrationManager
+from mediagoblin.db.migration_tools import MigrationManager
from mediagoblin.init import setup_global_and_app_config
from mediagoblin.tools.common import import_component
diff --git a/mediagoblin/plugins/oauth/migrations.py b/mediagoblin/plugins/oauth/migrations.py
index 45256dcc..6aa0d7cb 100644
--- a/mediagoblin/plugins/oauth/migrations.py
+++ b/mediagoblin/plugins/oauth/migrations.py
@@ -19,7 +19,7 @@ from sqlalchemy import (MetaData, Table, Column,
Integer, Unicode, Enum, DateTime, ForeignKey)
from sqlalchemy.ext.declarative import declarative_base
-from mediagoblin.db.sql.migration_tools import RegisterMigration
+from mediagoblin.db.migration_tools import RegisterMigration
from mediagoblin.db.models import User
diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py
index 4a260228..2fc4c043 100644
--- a/mediagoblin/tests/test_sql_migrations.py
+++ b/mediagoblin/tests/test_sql_migrations.py
@@ -26,7 +26,7 @@ from sqlalchemy.sql import select, insert
from migrate import changeset
from mediagoblin.db.base import GMGTableBase
-from mediagoblin.db.sql.migration_tools import MigrationManager, RegisterMigration
+from mediagoblin.db.migration_tools import MigrationManager, RegisterMigration
from mediagoblin.tools.common import CollectingPrinter