1 files changed, 7 insertions, 8 deletions

diff --git a/src/mailman/app/tests/test_inject.py b/src/mailman/app/tests/test_inject.py
index f7f750662..196c32182 100644
--- a/src/mailman/app/tests/test_inject.py
+++ b/src/mailman/app/tests/test_inject.py
@@ -17,10 +17,9 @@
 
 """Testing app.inject functions."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
+    'TestInjectMessage',
+    'TestInjectText',
     ]
 
 
@@ -64,7 +63,7 @@ Nothing.
         self.assertEqual(len(items), 1)
         self.assertMultiLineEqual(items[0].msg.as_string(),
                                   self.msg.as_string())
-        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
+        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
         self.assertEqual(items[0].msgdata['original_size'],
                          len(self.msg.as_string()))
 
@@ -84,7 +83,7 @@ Nothing.
         self.assertEqual(len(items), 1)
         self.assertMultiLineEqual(items[0].msg.as_string(),
                                   self.msg.as_string())
-        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
+        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
         self.assertEqual(items[0].msgdata['original_size'],
                          len(self.msg.as_string()))
 
@@ -144,7 +143,7 @@ class TestInjectText(unittest.TestCase):
 
     def setUp(self):
         self.mlist = create_list('test@example.com')
-        self.text = b"""\
+        self.text = """\
 From: bart@example.com
 To: test@example.com
 Subject: A test message
@@ -171,7 +170,7 @@ Nothing.
         # Delete that header because it is not in the original text.
         del items[0].msg['x-message-id-hash']
         self.assertMultiLineEqual(items[0].msg.as_string(), self.text)
-        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
+        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
         self.assertEqual(items[0].msgdata['original_size'],
                          # Add back the X-Message-ID-Header which was in the
                          # message contributing to the original_size, but
@@ -196,7 +195,7 @@ Nothing.
         # Remove the X-Message-ID-Hash header which isn't in the original text.
         del items[0].msg['x-message-id-hash']
         self.assertMultiLineEqual(items[0].msg.as_string(), self.text)
-        self.assertEqual(items[0].msgdata['listname'], 'test@example.com')
+        self.assertEqual(items[0].msgdata['listid'], 'test.example.com')
         self.assertEqual(items[0].msgdata['original_size'],
                          # Add back the X-Message-ID-Header which was in the
                          # message contributing to the original_size, but