Merge the Python 3 branch.

3 files changed, 9 insertions, 20 deletions

diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py
index e653133ba..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
 
 
@@ -149,8 +145,8 @@ class UserNotification(Message):
         subject = ('(no subject)' if subject is None else subject)
         if text is not None:
             self.set_payload(text.encode(charset), charset)
-        self['Subject'] = Header(subject.encode(charset), charset,
-                                 header_name='Subject', errors='replace')
+        self['Subject'] = Header(
+            subject, charset, header_name='Subject', errors='replace')
         self['From'] = sender
         if isinstance(recipients, (list, set, tuple)):
             self['To'] = COMMASPACE.join(recipients)
@@ -198,7 +194,7 @@ class UserNotification(Message):
             reduced_list_headers=True,
             )
         if mlist is not None:
-            enqueue_kws['listname'] = mlist.fqdn_listname
+            enqueue_kws['listid'] = mlist.list_id
         enqueue_kws.update(_kws)
         virginq.enqueue(self, **enqueue_kws)
 
@@ -227,7 +223,7 @@ class OwnerNotification(UserNotification):
         virginq = config.switchboards['virgin']
         # The message metadata better have a `recip' attribute
         virginq.enqueue(self,
-                        listname=mlist.fqdn_listname,
+                        listid=mlist.list_id,
                         recipients=self.recipients,
                         nodecorate=True,
                         reduced_list_headers=True,
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')
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?