11 files changed, 14 insertions, 51 deletions
diff --git a/src/mailman/database/alembic/__init__.py b/src/mailman/database/alembic/__init__.py
index ffd3af6df..4dbbc31d9 100644
--- a/src/mailman/database/alembic/__init__.py
+++ b/src/mailman/database/alembic/__init__.py
@@ -17,9 +17,6 @@
 
 """Alembic configuration initization."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'alembic_cfg',
     ]
diff --git a/src/mailman/database/alembic/env.py b/src/mailman/database/alembic/env.py
index 125868566..261782d29 100644
--- a/src/mailman/database/alembic/env.py
+++ b/src/mailman/database/alembic/env.py
@@ -17,9 +17,6 @@
 
 """Alembic migration environment."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'run_migrations_offline',
     'run_migrations_online',
@@ -28,11 +25,10 @@ __all__ = [
 
 from alembic import context
 from contextlib import closing
-from sqlalchemy import create_engine
-
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.utilities.string import expand
+from sqlalchemy import create_engine
 
 
 
diff --git a/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py b/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py
index 3feb24fff..5e3527abe 100644
--- a/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py
+++ b/src/mailman/database/alembic/versions/51b7f92bd06c_initial.py
@@ -29,9 +29,6 @@ Revises: None
 Create Date: 2014-10-10 09:53:35.624472
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'downgrade',
     'upgrade',
diff --git a/src/mailman/database/base.py b/src/mailman/database/base.py
index 55edf6005..09fd47b80 100644
--- a/src/mailman/database/base.py
+++ b/src/mailman/database/base.py
@@ -15,9 +15,8 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, unicode_literals
+"""Common database support."""
 
-__metaclass__ = type
 __all__ = [
     'SABaseDatabase',
     ]
@@ -25,17 +24,15 @@ __all__ = [
 
 import logging
 
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-from zope.interface import implementer
-
 from mailman.config import config
 from mailman.interfaces.database import IDatabase
 from mailman.utilities.string import expand
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from zope.interface import implementer
 
 
 log = logging.getLogger('mailman.database')
-NL = '\n'
 
 
 
diff --git a/src/mailman/database/factory.py b/src/mailman/database/factory.py
index 64174449d..9fffd4545 100644
--- a/src/mailman/database/factory.py
+++ b/src/mailman/database/factory.py
@@ -17,9 +17,6 @@
 
 """Database factory."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'DatabaseFactory',
     'DatabaseTestingFactory',
@@ -33,16 +30,15 @@ import alembic.command
 from alembic.migration import MigrationContext
 from alembic.script import ScriptDirectory
 from flufl.lock import Lock
-from sqlalchemy import MetaData
-from zope.interface import implementer
-from zope.interface.verify import verifyObject
-
 from mailman.config import config
 from mailman.database.alembic import alembic_cfg
 from mailman.database.model import Model
 from mailman.interfaces.database import (
     DatabaseError, IDatabase, IDatabaseFactory)
 from mailman.utilities.modules import call_name
+from sqlalchemy import MetaData
+from zope.interface import implementer
+from zope.interface.verify import verifyObject
 
 
 LAST_STORM_SCHEMA_VERSION = '20130406000000'
diff --git a/src/mailman/database/model.py b/src/mailman/database/model.py
index a6056bf63..8dad6f0cf 100644
--- a/src/mailman/database/model.py
+++ b/src/mailman/database/model.py
@@ -17,9 +17,6 @@
 
 """Base class for all database classes."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Model',
     ]
diff --git a/src/mailman/database/postgresql.py b/src/mailman/database/postgresql.py
index 717b69dd1..4a6f02da6 100644
--- a/src/mailman/database/postgresql.py
+++ b/src/mailman/database/postgresql.py
@@ -17,9 +17,6 @@
 
 """PostgreSQL database support."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'PostgreSQLDatabase',
     ]
diff --git a/src/mailman/database/sqlite.py b/src/mailman/database/sqlite.py
index 8540846e1..95dba460e 100644
--- a/src/mailman/database/sqlite.py
+++ b/src/mailman/database/sqlite.py
@@ -17,9 +17,6 @@
 
 """SQLite database support."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'SQLiteDatabase',
     ]
diff --git a/src/mailman/database/tests/test_factory.py b/src/mailman/database/tests/test_factory.py
index 29cca41ba..71f810a56 100644
--- a/src/mailman/database/tests/test_factory.py
+++ b/src/mailman/database/tests/test_factory.py
@@ -17,9 +17,6 @@
 
 """Test database schema migrations"""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestSchemaManager',
     ]
@@ -28,17 +25,16 @@ __all__ = [
 import unittest
 import alembic.command
 
-from mock import patch
-from sqlalchemy import MetaData, Table, Column, Integer, Unicode
-from sqlalchemy.exc import ProgrammingError, OperationalError
-from sqlalchemy.schema import Index
-
 from mailman.config import config
 from mailman.database.alembic import alembic_cfg
 from mailman.database.factory import LAST_STORM_SCHEMA_VERSION, SchemaManager
 from mailman.database.model import Model
 from mailman.interfaces.database import DatabaseError
 from mailman.testing.layers import ConfigLayer
+from mock import patch
+from sqlalchemy import MetaData, Table, Column, Integer, Unicode
+from sqlalchemy.exc import ProgrammingError, OperationalError
+from sqlalchemy.schema import Index
 
 
 
diff --git a/src/mailman/database/transaction.py b/src/mailman/database/transaction.py
index 3e156cfb8..dc468aaab 100644
--- a/src/mailman/database/transaction.py
+++ b/src/mailman/database/transaction.py
@@ -17,9 +17,6 @@
 
 """Transactional support."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'dbconnection',
     'transaction',
@@ -28,7 +25,6 @@ __all__ = [
 
 
 from contextlib import contextmanager
-
 from mailman.config import config
 
 
diff --git a/src/mailman/database/types.py b/src/mailman/database/types.py
index 1984b08b5..463d271f0 100644
--- a/src/mailman/database/types.py
+++ b/src/mailman/database/types.py
@@ -15,17 +15,14 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Storm type conversions."""
+"""Database type conversions."""
 
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Enum',
     'UUID',
     ]
 
+
 import uuid
 
 from sqlalchemy import Integer