7 files changed, 3 insertions, 25 deletions

diff --git a/src/mailman/handlers/tests/test_cook_headers.py b/src/mailman/handlers/tests/test_cook_headers.py
index d83a44f20..385f402c5 100644
--- a/src/mailman/handlers/tests/test_cook_headers.py
+++ b/src/mailman/handlers/tests/test_cook_headers.py
@@ -17,9 +17,6 @@
 
 """Test the cook_headers handler."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestCookHeaders',
     ]
@@ -50,6 +47,6 @@ class TestCookHeaders(unittest.TestCase):
         for msg in messages:
             try:
                 cook_headers.process(self._mlist, msg, {})
-            except AttributeError as e:
+            except AttributeError as error:
                 # LP: #1130696 would raise an AttributeError on .sender
-                self.fail(e)
+                self.fail(error)
diff --git a/src/mailman/handlers/tests/test_file_recips.py b/src/mailman/handlers/tests/test_file_recips.py
index 9f3e0ec6e..906530762 100644
--- a/src/mailman/handlers/tests/test_file_recips.py
+++ b/src/mailman/handlers/tests/test_file_recips.py
@@ -17,9 +17,6 @@
 
 """Test file-recips handler."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestFileRecips',
     ]
diff --git a/src/mailman/handlers/tests/test_filter.py b/src/mailman/handlers/tests/test_filter.py
index 292e646cd..b81744008 100644
--- a/src/mailman/handlers/tests/test_filter.py
+++ b/src/mailman/handlers/tests/test_filter.py
@@ -17,9 +17,6 @@
 
 """Test the filter handler."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestFilters',
     ]
diff --git a/src/mailman/handlers/tests/test_mimedel.py b/src/mailman/handlers/tests/test_mimedel.py
index c7c37152f..02cb275e0 100644
--- a/src/mailman/handlers/tests/test_mimedel.py
+++ b/src/mailman/handlers/tests/test_mimedel.py
@@ -17,9 +17,6 @@
 
 """Test the mime_delete handler."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestDispose',
     ]
@@ -27,8 +24,6 @@ __all__ = [
 
 import unittest
 
-from zope.component import getUtility
-
 from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.core import errors
@@ -40,6 +35,7 @@ from mailman.testing.helpers import (
     LogFileMark, configuration, get_queue_messages,
     specialized_message_from_string as mfs)
 from mailman.testing.layers import ConfigLayer
+from zope.component import getUtility
 
 
 
diff --git a/src/mailman/handlers/tests/test_recipients.py b/src/mailman/handlers/tests/test_recipients.py
index ef2021d2c..688dcce04 100644
--- a/src/mailman/handlers/tests/test_recipients.py
+++ b/src/mailman/handlers/tests/test_recipients.py
@@ -17,9 +17,6 @@
 
 """Testing various recipients stuff."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestMemberRecipients',
     'TestOwnerRecipients',
diff --git a/src/mailman/handlers/tests/test_subject_prefix.py b/src/mailman/handlers/tests/test_subject_prefix.py
index 1125f3811..f4fd8c113 100644
--- a/src/mailman/handlers/tests/test_subject_prefix.py
+++ b/src/mailman/handlers/tests/test_subject_prefix.py
@@ -17,9 +17,6 @@
 
 """Test the Subject header prefix munging.."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestSubjectPrefix',
     ]
diff --git a/src/mailman/handlers/tests/test_to_digest.py b/src/mailman/handlers/tests/test_to_digest.py
index 451ebf9a5..8562c3fd7 100644
--- a/src/mailman/handlers/tests/test_to_digest.py
+++ b/src/mailman/handlers/tests/test_to_digest.py
@@ -17,9 +17,6 @@
 
 """Test the to_digest handler."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestToDigest',
     ]