14 files changed, 8 insertions, 57 deletions

diff --git a/src/mailman/mta/aliases.py b/src/mailman/mta/aliases.py
index 1b5f37d44..c309fb27b 100644
--- a/src/mailman/mta/aliases.py
+++ b/src/mailman/mta/aliases.py
@@ -17,17 +17,13 @@
 
 """Utility for generating all the aliases of a mailing list."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'MailTransportAgentAliases',
     ]
 
 
-from zope.interface import implementer
-
 from mailman.interfaces.mta import IMailTransportAgentAliases
+from zope.interface import implementer
 
 
 SUBDESTINATIONS = (
diff --git a/src/mailman/mta/base.py b/src/mailman/mta/base.py
index 7b9180ea3..8d7ca75af 100644
--- a/src/mailman/mta/base.py
+++ b/src/mailman/mta/base.py
@@ -17,9 +17,6 @@
 
 """Base delivery class."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'BaseDelivery',
     'IndividualDelivery',
@@ -31,11 +28,10 @@ import socket
 import logging
 import smtplib
 
-from zope.interface import implementer
-
 from mailman.config import config
 from mailman.interfaces.mta import IMailTransportAgentDelivery
 from mailman.mta.connection import Connection
+from zope.interface import implementer
 
 
 log = logging.getLogger('mailman.smtp')
diff --git a/src/mailman/mta/bulk.py b/src/mailman/mta/bulk.py
index 4255e0c33..0dcd2cdf6 100644
--- a/src/mailman/mta/bulk.py
+++ b/src/mailman/mta/bulk.py
@@ -17,9 +17,6 @@
 
 """Bulk message delivery."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'BulkDelivery',
     ]
@@ -108,4 +105,3 @@ class BulkDelivery(BaseDelivery):
                 mlist, msg, msgdata, recipients)
             refused.update(chunk_refused)
         return refused
-
diff --git a/src/mailman/mta/connection.py b/src/mailman/mta/connection.py
index 8cf419545..9c49e5fb0 100644
--- a/src/mailman/mta/connection.py
+++ b/src/mailman/mta/connection.py
@@ -17,9 +17,6 @@
 
 """MTA connections."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Connection',
     ]
diff --git a/src/mailman/mta/decorating.py b/src/mailman/mta/decorating.py
index ac99b3624..b4944d960 100644
--- a/src/mailman/mta/decorating.py
+++ b/src/mailman/mta/decorating.py
@@ -17,9 +17,6 @@
 
 """Individualized delivery with header/footer decorations."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'DecoratingDelivery',
     'DecoratingMixin',
diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py
index be04a48bd..f01390397 100644
--- a/src/mailman/mta/deliver.py
+++ b/src/mailman/mta/deliver.py
@@ -17,9 +17,6 @@
 
 """Generic delivery."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'deliver',
     ]
diff --git a/src/mailman/mta/exim4.py b/src/mailman/mta/exim4.py
index 1180b59eb..f25b12233 100644
--- a/src/mailman/mta/exim4.py
+++ b/src/mailman/mta/exim4.py
@@ -17,9 +17,6 @@
 
 """Creation/deletion hooks for the Exim4 MTA."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'LMTP',
     ]
diff --git a/src/mailman/mta/null.py b/src/mailman/mta/null.py
index 7a3624b31..3b9f6322e 100644
--- a/src/mailman/mta/null.py
+++ b/src/mailman/mta/null.py
@@ -20,17 +20,13 @@
 Exim one example of an MTA that Just Works.
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'NullMTA',
     ]
 
 
-from zope.interface import implementer
-
 from mailman.interfaces.mta import IMailTransportAgentLifecycle
+from zope.interface import implementer
 
 
 
diff --git a/src/mailman/mta/personalized.py b/src/mailman/mta/personalized.py
index 967bca68a..4ea9075a3 100644
--- a/src/mailman/mta/personalized.py
+++ b/src/mailman/mta/personalized.py
@@ -17,9 +17,6 @@
 
 """Personalized delivery."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'PersonalizedDelivery',
     'PersonalizedMixin',
@@ -28,11 +25,10 @@ __all__ = [
 
 from email.header import Header
 from email.utils import formataddr
-from zope.component import getUtility
-
 from mailman.interfaces.mailinglist import Personalization
 from mailman.interfaces.usermanager import IUserManager
 from mailman.mta.verp import VERPDelivery
+from zope.component import getUtility
 
 
 
diff --git a/src/mailman/mta/postfix.py b/src/mailman/mta/postfix.py
index bb709c6b4..f76a401fa 100644
--- a/src/mailman/mta/postfix.py
+++ b/src/mailman/mta/postfix.py
@@ -17,9 +17,6 @@
 
 """Creation/deletion hooks for the Postfix MTA."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'LMTP',
     ]
@@ -29,16 +26,15 @@ import os
 import logging
 
 from flufl.lock import Lock
-from operator import attrgetter
-from zope.component import getUtility
-from zope.interface import implementer
-
 from mailman.config import config
 from mailman.config.config import external_configuration
 from mailman.interfaces.listmanager import IListManager
 from mailman.interfaces.mta import (
     IMailTransportAgentAliases, IMailTransportAgentLifecycle)
 from mailman.utilities.datetime import now
+from operator import attrgetter
+from zope.component import getUtility
+from zope.interface import implementer
 
 
 log = logging.getLogger('mailman.error')
diff --git a/src/mailman/mta/tests/test_aliases.py b/src/mailman/mta/tests/test_aliases.py
index 30c57e292..8eeeef2c8 100644
--- a/src/mailman/mta/tests/test_aliases.py
+++ b/src/mailman/mta/tests/test_aliases.py
@@ -17,9 +17,6 @@
 
 """Test the MTA file generating utility."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestAliases',
     'TestPostfix',
@@ -31,13 +28,12 @@ import shutil
 import tempfile
 import unittest
 
-from zope.component import getUtility
-
 from mailman.app.lifecycle import create_list
 from mailman.interfaces.domain import IDomainManager
 from mailman.interfaces.mta import IMailTransportAgentAliases
 from mailman.mta.postfix import LMTP
 from mailman.testing.layers import ConfigLayer
+from zope.component import getUtility
 
 
 NL = '\n'
diff --git a/src/mailman/mta/tests/test_connection.py b/src/mailman/mta/tests/test_connection.py
index 94b5904b5..74d0e537c 100644
--- a/src/mailman/mta/tests/test_connection.py
+++ b/src/mailman/mta/tests/test_connection.py
@@ -17,9 +17,6 @@
 
 """Test MTA connections."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestConnection',
     ]
diff --git a/src/mailman/mta/tests/test_delivery.py b/src/mailman/mta/tests/test_delivery.py
index 0a910c13d..a2960f7cc 100644
--- a/src/mailman/mta/tests/test_delivery.py
+++ b/src/mailman/mta/tests/test_delivery.py
@@ -17,9 +17,6 @@
 
 """Test various aspects of email delivery."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestIndividualDelivery',
     ]
diff --git a/src/mailman/mta/verp.py b/src/mailman/mta/verp.py
index c3d1d0999..2d436b8cb 100644
--- a/src/mailman/mta/verp.py
+++ b/src/mailman/mta/verp.py
@@ -17,9 +17,6 @@
 
 """VERP delivery."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'VERPDelivery',
     'VERPMixin',