Merge the Python 3 branch.

4 files changed, 2 insertions, 16 deletions

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