1 files changed, 4 insertions, 7 deletions

diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py
index 1fdef5e86..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
@@ -66,7 +63,7 @@ class TestMessage(unittest.TestCase):
 class TestMessageSubclass(unittest.TestCase):
     def test_i18n_filenames(self):
         parser = FeedParser(_factory=Message)
-        parser.feed(b"""\
+        parser.feed("""\
 Message-ID: <blah@example.com>
 Content-Type: multipart/mixed; boundary="------------050607040206050605060208"
 
@@ -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')