Move mailman.Message to mailman.email.Message. Rename Message.get_sender() to

Message.sender (property) and Message.get_senders() to Message.senders
(another property).  The semantics of .sender is slightly different too; it no
longer consults config.mailman.use_envelope_sender.

Add absolute_import and unicode_literals to Utils.py, and clean up a few
imports.

5 files changed, 11 insertions, 14 deletions

diff --git a/src/mailman/queue/__init__.py b/src/mailman/queue/__init__.py
index ead077e90..1f284ba4d 100644
--- a/src/mailman/queue/__init__.py
+++ b/src/mailman/queue/__init__.py
@@ -49,9 +49,9 @@ from cStringIO import StringIO
 from lazr.config import as_boolean, as_timedelta
 from zope.interface import implements
 
-from mailman import Message
 from mailman import i18n
 from mailman.config import config
+from mailman.email.message import Message
 from mailman.interfaces.runner import IRunner
 from mailman.interfaces.switchboard import ISwitchboard
 from mailman.utilities.filesystem import makedirs
@@ -186,7 +186,7 @@ class Switchboard:
             # have to generate the message later when we do size restriction
             # checking.
             original_size = len(msg)
-            msg = email.message_from_string(msg, Message.Message)
+            msg = email.message_from_string(msg, Message)
             msg.original_size = original_size
             data['original_size'] = original_size
         return msg, data
@@ -427,9 +427,8 @@ class Runner:
         # will be the list's preferred language.  However, we must take
         # special care to reset the defaults, otherwise subsequent messages
         # may be translated incorrectly.
-        sender = msg.get_sender()
-        if sender:
-            member = mlist.members.get_member(sender)
+        if msg.sender:
+            member = mlist.members.get_member(msg.sender)
             language = (member.preferred_language
                         if member is not None
                         else mlist.preferred_language)
diff --git a/src/mailman/queue/command.py b/src/mailman/queue/command.py
index d2be7c9fd..8a7793e9e 100644
--- a/src/mailman/queue/command.py
+++ b/src/mailman/queue/command.py
@@ -37,14 +37,14 @@ from email.Header import decode_header, make_header
 from email.Iterators import typed_subpart_iterator
 from zope.interface import implements
 
-from mailman import Message
 from mailman.config import config
+from mailman.email.message import Message, UserNotification
 from mailman.i18n import _
 from mailman.interfaces.command import ContinueProcessing, IEmailResults
 from mailman.queue import Runner
 
-NL = '\n'
 
+NL = '\n'
 log = logging.getLogger('mailman.vette')
 
 
@@ -195,10 +195,9 @@ class CommandRunner(Runner):
         # Send a reply, but do not attach the original message.  This is a
         # compromise because the original message is often helpful in tracking
         # down problems, but it's also a vector for backscatter spam.
-        reply = Message.UserNotification(
-            msg.get_sender(), mlist.bounces_address,
-            _('The results of your email commands'),
-            lang=msgdata['lang'])
+        reply = UserNotification(msg.sender, mlist.bounces_address,
+                                 _('The results of your email commands'),
+                                 lang=msgdata['lang'])
         # Find a charset for the response body.  Try ascii first, then
         # latin-1 and finally falling back to utf-8.
         reply_body = unicode(results)
diff --git a/src/mailman/queue/docs/outgoing.txt b/src/mailman/queue/docs/outgoing.txt
index 6722dee84..1c9d89041 100644
--- a/src/mailman/queue/docs/outgoing.txt
+++ b/src/mailman/queue/docs/outgoing.txt
@@ -11,7 +11,6 @@ recipient set will be batched, whether messages will be personalized and
 VERP'd, etc.  The outgoing runner doesn't itself support retrying but it can
 move messages to the 'retry queue' for handling delivery failures.
 
-    >>> from mailman.app.lifecycle import create_list
     >>> mlist = create_list(u'test@example.com')
 
     >>> from mailman.app.membership import add_member
diff --git a/src/mailman/queue/lmtp.py b/src/mailman/queue/lmtp.py
index 3ac8796ca..8befa72b4 100644
--- a/src/mailman/queue/lmtp.py
+++ b/src/mailman/queue/lmtp.py
@@ -38,9 +38,9 @@ import asyncore
 
 from email.utils import parseaddr
 
-from mailman.Message import Message
 from mailman.config import config
 from mailman.database.transaction import txn
+from mailman.email.message import Message
 from mailman.queue import Runner
 
 elog = logging.getLogger('mailman.error')
diff --git a/src/mailman/queue/maildir.py b/src/mailman/queue/maildir.py
index e8d454d39..eeb503f65 100644
--- a/src/mailman/queue/maildir.py
+++ b/src/mailman/queue/maildir.py
@@ -56,8 +56,8 @@ import logging
 from email.Parser import Parser
 from email.Utils import parseaddr
 
-from mailman.Message import Message
 from mailman.config import config
+from mailman.message import Message
 from mailman.queue import Runner
 
 log = logging.getLogger('mailman.error')