3 files changed, 4 insertions, 15 deletions

diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py
index d77afcbe0..d4b373bea 100644
--- a/src/mailman/email/message.py
+++ b/src/mailman/email/message.py
@@ -23,9 +23,6 @@ safe pickle deserialization, even if the email package adds additional Message
 attributes.
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Message',
     'MultipartDigestMessage',
@@ -40,7 +37,6 @@ import email.utils
 
 from email.header import Header
 from email.mime.multipart import MIMEMultipart
-
 from mailman.config import config
 
 
diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py
index 280a86477..59335b890 100644
--- a/src/mailman/email/tests/test_message.py
+++ b/src/mailman/email/tests/test_message.py
@@ -17,9 +17,6 @@
 
 """Test the message API."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestMessage',
     'TestMessageSubclass',
@@ -27,8 +24,8 @@ __all__ = [
 
 
 import unittest
-from email.parser import FeedParser
 
+from email.parser import FeedParser
 from mailman.app.lifecycle import create_list
 from mailman.email.message import Message, UserNotification
 from mailman.testing.helpers import get_queue_messages
@@ -88,6 +85,6 @@ Test content
         attachment = msg.get_payload(1)
         try:
             filename = attachment.get_filename()
-        except TypeError as e:
-            self.fail(e)
+        except TypeError as error:
+            self.fail(error)
         self.assertEqual(filename, u'd\xe9jeuner.txt')
diff --git a/src/mailman/email/validate.py b/src/mailman/email/validate.py
index b4cf8b5e2..d6f664b01 100644
--- a/src/mailman/email/validate.py
+++ b/src/mailman/email/validate.py
@@ -17,9 +17,6 @@
 
 """Email address validation."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Validator',
     ]
@@ -27,11 +24,10 @@ __all__ = [
 
 import re
 
-from zope.interface import implementer
-
 from mailman.interfaces.address import (
     IEmailValidator, InvalidEmailAddressError)
 from mailman.utilities.email import split_email
+from zope.interface import implementer
 
 
 # What other characters should be disallowed?