update

Author: jaredmauch

Mailman/Digester.py

@@ -29,7 +29,7 @@
 
 # Lazy import to avoid circular dependency
 def get_to_digest():
-    from Mailman.Handlers import ToDigest
+    import Mailman.Handlers.ToDigest as ToDigest
     return ToDigest
 
 

Mailman/Handlers/Moderate.py

@@ -35,7 +35,7 @@
 
 # Lazy imports to avoid circular dependencies
 def get_hold():
-    from Mailman.Handlers import Hold
+    import Mailman.Handlers.Hold as Hold
     return Hold
 
 def get_mail_list():

Mailman/ListAdmin.py

@@ -23,8 +23,7 @@
 elsewhere.
 """
 
-from builtins import str
-from builtins import object
+from builtins import str, object
 import os
 import time
 import errno
@@ -41,11 +40,11 @@
 from email.generator import Generator
 from email.utils import getaddresses
 import email.message
-from email.message import Message
+from email.message import Message as EmailMessage
 
 from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.Message import Message
+import Mailman.Message as Message
 from Mailman import Errors
 from Mailman.UserDesc import UserDesc
 from Mailman.Queue.sbcache import get_switchboard
@@ -379,12 +378,12 @@ def __handlepost(self, record, value, comment, preserve, forward, addr):
         elif value == mm_cfg.APPROVE:
             # Approved.
             try:
-                msg = email.message_from_file(fp, Message)
+                msg = email.message_from_file(fp, EmailMessage)
             except IOError as e:
                 if e.errno != errno.ENOENT: raise
                 return LOST
             # Convert to Mailman.Message if needed
-            if isinstance(msg, Message) and not isinstance(msg, Message):
+            if isinstance(msg, EmailMessage) and not isinstance(msg, Message):
                 mailman_msg = Message()
                 # Copy all attributes from the original message
                 for key, value in msg.items():
@@ -436,12 +435,12 @@ def __handlepost(self, record, value, comment, preserve, forward, addr):
             # since we don't want to share any state or information with the
             # normal delivery.
             try:
-                copy = email.message_from_file(fp, Message)
+                copy = email.message_from_file(fp, EmailMessage)
             except IOError as e:
                 if e.errno != errno.ENOENT: raise
                 raise Errors.LostHeldMessage(path)
             # Convert to Mailman.Message if needed
-            if isinstance(copy, Message) and not isinstance(copy, Message):
+            if isinstance(copy, EmailMessage) and not isinstance(copy, Message):
                 mailman_msg = Message()
                 # Copy all attributes from the original message
                 for key, value in copy.items():
@@ -804,9 +803,9 @@ def readMessage(path):
     fp = open(path, 'rb')
     try:
         if ext == '.txt':
-            msg = email.message_from_file(fp, Message)
+            msg = email.message_from_file(fp, EmailMessage)
             # Convert to Mailman.Message if needed
-            if isinstance(msg, Message) and not isinstance(msg, Message):
+            if isinstance(msg, EmailMessage) and not isinstance(msg, Message):
                 mailman_msg = Message()
                 # Copy all attributes from the original message
                 for key, value in msg.items():
@@ -822,7 +821,7 @@ def readMessage(path):
             assert ext == '.pck'
             msg = pickle.load(fp, fix_imports=True, encoding='latin1')
             # Convert to Mailman.Message if needed
-            if isinstance(msg, Message) and not isinstance(msg, Message):
+            if isinstance(msg, EmailMessage) and not isinstance(msg, Message):
                 mailman_msg = Message()
                 # Copy all attributes from the original message
                 for key, value in msg.items():

Mailman/Message.py

@@ -21,6 +21,7 @@
 which is more convenient for use inside Mailman.
 """
 
+from builtins import object
 import re
 from io import StringIO
 import time
@@ -31,6 +32,7 @@
 import email.utils
 from email.charset import Charset
 from email.header import Header
+from email.message import Message as EmailMessage
 
 from Mailman import mm_cfg
 from Mailman.Utils import GetCharSet, unique_message_id, get_site_email
@@ -62,11 +64,11 @@ def clone(self, fp):
                 self.__children_maxheaderlen, self.__children_maxheaderlen)
 
 
-class Message(email.message.Message):
+class Message(EmailMessage):
     def __init__(self):
         # We need a version number so that we can optimize __setstate__()
         self.__version__ = VERSION
-        email.message.Message.__init__(self)
+        EmailMessage.__init__(self)
 
     # BAW: For debugging w/ bin/dumpdb.  Apparently pprint uses repr.
     def __repr__(self):

Mailman/Queue/BounceRunner.py

@@ -17,7 +17,8 @@
 
 """Bounce queue runner.
 
-This module is responsible for processing bounce messages.
+This module is responsible for processing bounce messages.  It's a separate
+queue from the virgin queue because bounces need different handling.
 """
 
 from builtins import object, str
@@ -26,33 +27,31 @@
 import time
 import pickle
 import email
-from email.utils import getaddresses
+from email.utils import getaddresses, parseaddr
 from email.iterators import body_line_iterator
+from email.mime.text import MIMEText
+from email.mime.message import MIMEMessage
 import traceback
 from io import StringIO
 import sys
 
-from email.mime.text import MIMEText
-from email.mime.message import MIMEMessage
-from email.utils import parseaddr
-
 from Mailman import mm_cfg
 from Mailman import Utils
 from Mailman import LockFile
 from Mailman import Errors
 from Mailman import i18n
 from Mailman.Errors import NotAMemberError
-from Mailman.Message import Message, UserNotification
 from Mailman.Bouncer import _BounceInfo
 from Mailman.Bouncers import BouncerAPI
 from Mailman.Queue.Runner import Runner
 from Mailman.Queue.sbcache import get_switchboard
 from Mailman.Logging.Syslog import syslog
 from Mailman.i18n import _
+import Mailman.Message as Message
 
 # Lazy import to avoid circular dependency
 def get_mail_list():
-    from Mailman.MailList import MailList
+    import Mailman.MailList as MailList
     return MailList
 
 COMMASPACE = ', '

Mailman/Queue/CommandRunner.py

@@ -32,7 +32,7 @@
 from Mailman.htmlformat import *
 from Mailman.Logging.Syslog import mailman_log, syslog
 from Mailman.Utils import validate_ip_address
-from Mailman.Handlers.Replybot import Replybot
+import Mailman.Handlers.Replybot as Replybot
 from Mailman.Message import Message
 from Mailman.i18n import _
 from Mailman.Queue.Runner import Runner
@@ -47,11 +47,11 @@
 
 # Lazy imports to avoid circular dependencies
 def get_replybot():
-    from Mailman.Handlers import Replybot
+    import Mailman.Handlers.Replybot as Replybot
     return Replybot
 
 def get_maillist():
-    from Mailman.MailList import MailList
+    import Mailman.MailList as MailList
     return MailList
 
 NL = '\n'

Mailman/Queue/IncomingRunner.py

@@ -116,7 +116,8 @@
 from Mailman import LockFile
 from Mailman.Queue.Runner import Runner
 from Mailman.Logging.Syslog import mailman_log
-from Mailman.MailList import MailList
+import Mailman.MailList as MailList
+import Mailman.Message as Message
 
 
 class PipelineError(Exception):
@@ -338,8 +339,8 @@ def _oneloop(self):
                         # Create a MailList object using lazy import
                         try:
                             # Import MailList here to avoid circular imports
-                            from Mailman.MailList import MailList
-                            mlist = MailList(listname, lock=0)
+                            import Mailman.MailList as MailList
+                            mlist = MailList.MailList(listname, lock=0)
                         except ImportError:
                             # If we can't import MailList, try to get it from sys.modules
                             import sys

Mailman/Queue/NewsRunner.py

@@ -38,8 +38,8 @@
 from Mailman import i18n
 from Mailman.Queue.Runner import Runner
 from Mailman.Logging.Syslog import mailman_log, syslog
-from Mailman.Message import Message
-from Mailman.MailList import MailList
+import Mailman.Message as Message
+import Mailman.MailList as MailList
 
 # Only import nntplib if NNTP support is enabled
 try:

Mailman/Queue/OutgoingRunner.py

@@ -32,19 +32,19 @@
 from Mailman import Utils
 from Mailman import Errors
 from Mailman import i18n
-from Mailman.Message import Message
 from Mailman.Logging.Syslog import mailman_log
 from Mailman.Queue.Runner import Runner
 from Mailman.Queue.Switchboard import Switchboard
 from Mailman.Queue.BounceRunner import BounceMixin
+import Mailman.Message as Message
 
 # Lazy import to avoid circular dependency
 def get_mail_list():
-    from Mailman.MailList import MailList
+    import Mailman.MailList as MailList
     return MailList
 
 def get_replybot():
-    from Mailman.Handlers import Replybot
+    import Mailman.Handlers.Replybot as Replybot
     return Replybot
 
 # This controls how often _doperiodic() will try to deal with deferred

Mailman/Queue/RetryRunner.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2018 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -12,20 +12,31 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
+"""Retry queue runner.
+
+This module is responsible for retrying failed message deliveries.  It's a
+separate queue from the virgin queue because retries need different handling.
+"""
+
+from builtins import object
 import time
 import traceback
 import os
 import sys
 import threading
+import email.message
 
 from Mailman import mm_cfg
 from Mailman import Errors
 from Mailman.Queue.Runner import Runner
 from Mailman.Queue.Switchboard import Switchboard
 from Mailman.Errors import MMUnknownListError
 from Mailman.Logging.Syslog import mailman_log
+import Mailman.MailList as MailList
+import Mailman.Message as Message
 
 class RetryRunner(Runner):
     QDIR = mm_cfg.RETRYQUEUE_DIR