13 files changed, 13 insertions, 62 deletions
diff --git a/src/mailman/chains/accept.py b/src/mailman/chains/accept.py
index f5dd5a73d..89995b5a1 100644
--- a/src/mailman/chains/accept.py
+++ b/src/mailman/chains/accept.py
@@ -17,9 +17,6 @@
 
 """The terminal 'accept' chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'AcceptChain',
     ]
@@ -27,12 +24,11 @@ __all__ = [
 
 import logging
 
-from zope.event import notify
-
 from mailman.chains.base import TerminalChainBase
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.chain import AcceptEvent
+from zope.event import notify
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/base.py b/src/mailman/chains/base.py
index 37d8e76f3..7db31de73 100644
--- a/src/mailman/chains/base.py
+++ b/src/mailman/chains/base.py
@@ -17,9 +17,6 @@
 
 """Base class for terminal chains."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Chain',
     'Link',
@@ -27,11 +24,10 @@ __all__ = [
     ]
 
 
-from zope.interface import implementer
-
 from mailman.config import config
 from mailman.interfaces.chain import (
     IChain, IChainIterator, IChainLink, IMutableChain, LinkAction)
+from zope.interface import implementer
 
 
 
diff --git a/src/mailman/chains/builtin.py b/src/mailman/chains/builtin.py
index bce9349a1..b26b31550 100644
--- a/src/mailman/chains/builtin.py
+++ b/src/mailman/chains/builtin.py
@@ -17,9 +17,6 @@
 
 """The default built-in starting chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'BuiltInChain',
     ]
@@ -27,12 +24,11 @@ __all__ = [
 
 import logging
 
-from zope.interface import implementer
-
 from mailman.chains.base import Link
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.chain import IChain, LinkAction
+from zope.interface import implementer
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/discard.py b/src/mailman/chains/discard.py
index 001b243ac..9eb419201 100644
--- a/src/mailman/chains/discard.py
+++ b/src/mailman/chains/discard.py
@@ -17,20 +17,17 @@
 
 """The terminal 'discard' chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'DiscardChain',
     ]
 
 
 import logging
-from zope.event import notify
 
 from mailman.chains.base import TerminalChainBase
 from mailman.core.i18n import _
 from mailman.interfaces.chain import DiscardEvent
+from zope.event import notify
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/headers.py b/src/mailman/chains/headers.py
index b37079f7f..5738336e8 100644
--- a/src/mailman/chains/headers.py
+++ b/src/mailman/chains/headers.py
@@ -17,9 +17,6 @@
 
 """The header-matching chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'HeaderMatchChain',
     ]
@@ -28,13 +25,12 @@ __all__ = [
 import re
 import logging
 
-from zope.interface import implementer
-
 from mailman.chains.base import Chain, Link
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.chain import LinkAction
 from mailman.interfaces.rules import IRule
+from zope.interface import implementer
 
 
 log = logging.getLogger('mailman.error')
diff --git a/src/mailman/chains/hold.py b/src/mailman/chains/hold.py
index 5bb482cd5..7a516dc0d 100644
--- a/src/mailman/chains/hold.py
+++ b/src/mailman/chains/hold.py
@@ -17,9 +17,6 @@
 
 """The terminal 'hold' chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'HoldChain',
     ]
@@ -30,10 +27,6 @@ import logging
 from email.mime.message import MIMEMessage
 from email.mime.text import MIMEText
 from email.utils import formatdate, make_msgid
-from zope.component import getUtility
-from zope.event import notify
-from zope.interface import implementer
-
 from mailman.app.moderator import hold_message
 from mailman.app.replybot import can_acknowledge
 from mailman.chains.base import TerminalChainBase
@@ -47,6 +40,9 @@ from mailman.interfaces.pending import IPendable, IPendings
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.i18n import make
 from mailman.utilities.string import oneline, wrap
+from zope.component import getUtility
+from zope.event import notify
+from zope.interface import implementer
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/moderation.py b/src/mailman/chains/moderation.py
index 9b34f6389..944a66089 100644
--- a/src/mailman/chains/moderation.py
+++ b/src/mailman/chains/moderation.py
@@ -34,21 +34,17 @@ made as to the disposition of the message.  `defer` is the default for
 members, while `hold` is the default for nonmembers.
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'ModerationChain',
     ]
 
 
-from zope.interface import implementer
-
 from mailman.chains.base import Link
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action
 from mailman.interfaces.chain import IChain, LinkAction
+from zope.interface import implementer
 
 
 
diff --git a/src/mailman/chains/owner.py b/src/mailman/chains/owner.py
index 8e9aac154..9b0670ac9 100644
--- a/src/mailman/chains/owner.py
+++ b/src/mailman/chains/owner.py
@@ -17,9 +17,6 @@
 
 """The standard -owner posting chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'BuiltInOwnerChain',
     ]
@@ -27,12 +24,11 @@ __all__ = [
 
 import logging
 
-from zope.event import notify
-
 from mailman.chains.base import TerminalChainBase
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.chain import AcceptOwnerEvent
+from zope.event import notify
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/reject.py b/src/mailman/chains/reject.py
index e24cedb85..2f358afe1 100644
--- a/src/mailman/chains/reject.py
+++ b/src/mailman/chains/reject.py
@@ -17,9 +17,6 @@
 
 """The terminal 'reject' chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'RejectChain',
     ]
@@ -27,12 +24,11 @@ __all__ = [
 
 import logging
 
-from zope.event import notify
-
 from mailman.app.bounces import bounce_message
 from mailman.chains.base import TerminalChainBase
 from mailman.core.i18n import _
 from mailman.interfaces.chain import RejectEvent
+from zope.event import notify
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/tests/test_base.py b/src/mailman/chains/tests/test_base.py
index 8d0d70449..784309395 100644
--- a/src/mailman/chains/tests/test_base.py
+++ b/src/mailman/chains/tests/test_base.py
@@ -17,9 +17,6 @@
 
 """Test the base chain stuff."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestMiscellaneous',
     ]
diff --git a/src/mailman/chains/tests/test_headers.py b/src/mailman/chains/tests/test_headers.py
index adfc0ecb6..55bed3af0 100644
--- a/src/mailman/chains/tests/test_headers.py
+++ b/src/mailman/chains/tests/test_headers.py
@@ -17,9 +17,6 @@
 
 """Test the header chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestHeaderChain',
     ]
diff --git a/src/mailman/chains/tests/test_hold.py b/src/mailman/chains/tests/test_hold.py
index a1fddd558..2a49b0ff0 100644
--- a/src/mailman/chains/tests/test_hold.py
+++ b/src/mailman/chains/tests/test_hold.py
@@ -17,9 +17,6 @@
 
 """Additional tests for the hold chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestAutorespond',
     ]
@@ -27,14 +24,13 @@ __all__ = [
 
 import unittest
 
-from zope.component import getUtility
-
 from mailman.app.lifecycle import create_list
 from mailman.chains.hold import autorespond_to_sender
 from mailman.interfaces.autorespond import IAutoResponseSet, Response
 from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import configuration, get_queue_messages
 from mailman.testing.layers import ConfigLayer
+from zope.component import getUtility
 
 
 
diff --git a/src/mailman/chains/tests/test_owner.py b/src/mailman/chains/tests/test_owner.py
index 96b858317..0766ba630 100644
--- a/src/mailman/chains/tests/test_owner.py
+++ b/src/mailman/chains/tests/test_owner.py
@@ -17,9 +17,6 @@
 
 """Test the owner chain."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestOwnerChain',
     ]
@@ -32,8 +29,7 @@ from mailman.chains.owner import BuiltInOwnerChain
 from mailman.core.chains import process
 from mailman.interfaces.chain import AcceptOwnerEvent
 from mailman.testing.helpers import (
-    event_subscribers,
-    get_queue_messages,
+    event_subscribers, get_queue_messages,
     specialized_message_from_string as mfs)
 from mailman.testing.layers import ConfigLayer