7 files changed, 16 insertions, 15 deletions

diff --git a/src/mailman/database/alembic/script.py.mako b/src/mailman/database/alembic/script.py.mako
index acc126c54..bc5a40da7 100644
--- a/src/mailman/database/alembic/script.py.mako
+++ b/src/mailman/database/alembic/script.py.mako
@@ -10,9 +10,9 @@ Create Date: ${create_date}
 revision = ${repr(up_revision)}
 down_revision = ${repr(down_revision)}
 
-from alembic import op
 import sqlalchemy as sa
-from mailman.database.utilities import is_sqlite, exists_in_db
+from alembic import op
+from mailman.database.helpers import is_sqlite, exists_in_db
 ${imports if imports else ""}
 
 def upgrade():
diff --git a/src/mailman/database/alembic/versions/16c2b25c7b_list_subscription_policy.py b/src/mailman/database/alembic/versions/16c2b25c7b_list_subscription_policy.py
index 1d21735c6..16baf64b7 100644
--- a/src/mailman/database/alembic/versions/16c2b25c7b_list_subscription_policy.py
+++ b/src/mailman/database/alembic/versions/16c2b25c7b_list_subscription_policy.py
@@ -14,7 +14,7 @@ from alembic import op
 import sqlalchemy as sa
 
 from mailman.database.types import Enum
-from mailman.database.utilities import is_sqlite, exists_in_db
+from mailman.database.helpers import is_sqlite, exists_in_db
 from mailman.interfaces.mailinglist import SubscriptionPolicy
 
 
@@ -22,7 +22,7 @@ def upgrade():
 
     ### Update the schema
     if not exists_in_db(op.get_bind(), 'mailinglist', 'subscription_policy'):
-        # SQL may not have removed it when downgrading.
+        # SQLite may not have removed it when downgrading.
         op.add_column('mailinglist', sa.Column(
             'subscription_policy', Enum(SubscriptionPolicy), nullable=True))
 
diff --git a/src/mailman/database/alembic/versions/33e1f5f6fa8_.py b/src/mailman/database/alembic/versions/33e1f5f6fa8_.py
index 45d5929d9..0d6bddf37 100644
--- a/src/mailman/database/alembic/versions/33e1f5f6fa8_.py
+++ b/src/mailman/database/alembic/versions/33e1f5f6fa8_.py
@@ -33,7 +33,7 @@ __all__ = [
 
 from alembic import op
 import sqlalchemy as sa
-from mailman.database.utilities import is_sqlite
+from mailman.database.helpers import is_sqlite
 
 
 # revision identifiers, used by Alembic.
diff --git a/src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py b/src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py
index 826961d73..04c647504 100644
--- a/src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py
+++ b/src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py
@@ -29,7 +29,7 @@ down_revision = '33e1f5f6fa8'
 
 from alembic import op
 import sqlalchemy as sa
-from mailman.database.utilities import is_sqlite, exists_in_db
+from mailman.database.helpers import is_sqlite, exists_in_db
 
 
 def upgrade():
@@ -42,7 +42,7 @@ def upgrade():
         sa.PrimaryKeyConstraint('user_id', 'domain_id')
         )
     if not exists_in_db(op.get_bind(), 'user', 'is_server_owner'):
-        # SQL may not have removed it when downgrading.
+        # SQLite may not have removed it when downgrading.
         op.add_column(
             'user',
             sa.Column('is_server_owner', sa.Boolean(), nullable=True))
diff --git a/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py b/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py
index ff55e5174..36e394c6a 100644
--- a/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py
+++ b/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py
@@ -35,9 +35,9 @@ __all__ = [
     ]
 
 
-from alembic import op
 import sqlalchemy as sa
-from mailman.database.utilities import is_sqlite, exists_in_db
+from alembic import op
+from mailman.database.helpers import is_sqlite, exists_in_db
 
 
 # Revision identifiers, used by Alembic.
diff --git a/src/mailman/database/utilities.py b/src/mailman/database/helpers.py
index 0db4848ca..dafd3b512 100644
--- a/src/mailman/database/utilities.py
+++ b/src/mailman/database/helpers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2015 by the Free Software Foundation, Inc.
+# Copyright (C) 2015 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
@@ -15,10 +15,11 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Common database utilities."""
+"""Common database helpers."""
 
 __all__ = [
     'exists_in_db',
+    'is_sqlite',
     ]
 
 import sqlalchemy as sa
diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py
index 201fd618a..e0a2c471d 100644
--- a/src/mailman/database/tests/test_migrations.py
+++ b/src/mailman/database/tests/test_migrations.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015 by the Free Software Foundation, Inc.
+# Copyright (C) 2015 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
@@ -22,14 +22,14 @@ __all__ = [
     ]
 
 
-import unittest
 import alembic.command
+import sqlalchemy as sa
+import unittest
 
 from mailman.config import config
 from mailman.database.alembic import alembic_cfg
 from mailman.database.model import Model
 from mailman.testing.layers import ConfigLayer
-import sqlalchemy as sa
 
 
 
@@ -51,7 +51,7 @@ class TestMigrations(unittest.TestCase):
     def test_all_migrations(self):
         script_dir = alembic.script.ScriptDirectory.from_config(alembic_cfg)
         revisions = [sc.revision for sc in
-                     script_dir.walk_revisions("base", "heads")]
+                     script_dir.walk_revisions('base', 'heads')]
         for revision in revisions:
             alembic.command.downgrade(alembic_cfg, revision)
         revisions.reverse()