update

Author: jaredmauch

Mailman/ListAdmin.py

@@ -481,7 +481,7 @@ def __handlepost(self, record, value, comment, preserve, forward, addr):
             # Stick the message back in the incoming queue for further
             # processing.
             inq = get_switchboard(mm_cfg.INQUEUE_DIR)
-            inq.enqueue(msg, _metadata=msgdata)
+            inq.enqueue(msg, msgdata=msgdata)
         elif value == mm_cfg.REJECT:
             # Rejected
             rejection = 'Refused'

Mailman/MTA/Manual.py

@@ -136,4 +136,4 @@ def remove(mlist, cgi=False):
         sfp.getvalue(), mm_cfg.DEFAULT_SERVER_LANGUAGE)
     msg['Date'] = email.utils.formatdate(localtime=1)
     outq = get_switchboard(mm_cfg.OUTQUEUE_DIR)
-    outq.enqueue(msg, recips=[siteowner], nodecorate=1)
+    outq.enqueue(msg, msgdata={'recips': [siteowner], 'nodecorate': 1})

Mailman/Post.py

@@ -33,7 +33,7 @@ def inject(listname, msg, recips=None, qdir=None):
            }
     if recips:
         kws['recips'] = recips
-    queue.enqueue(msg, **kws)
+    queue.enqueue(msg, msgdata=kws)
 
 
 

Mailman/Queue/NewsRunner.py

@@ -128,7 +128,7 @@ def _oneloop(self):
         except Exception as e:
             mailman_log('error', 'NewsRunner error: %s', str(e))
             # Put the message back in the queue
-            self._switchboard.enqueue(msg)
+            self._switchboard.enqueue(msg, msgdata={})
         return 1
 
     def _dispose(self, mlist, msg, msgdata):

scripts/bounces

@@ -54,7 +54,7 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     bounceq = get_switchboard(mm_cfg.BOUNCEQUEUE_DIR)
-    bounceq.enqueue(sys.stdin.read(), listname=listname, _plaintext=1)
+    bounceq.enqueue(sys.stdin.read(), msgdata={'listname': listname, '_plaintext': 1})
 
 
 

scripts/confirm

@@ -54,8 +54,7 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     cmdq = get_switchboard(mm_cfg.CMDQUEUE_DIR)
-    cmdq.enqueue(sys.stdin.read(), listname=listname, toconfirm=1,
-                 _plaintext=1)
+    cmdq.enqueue(sys.stdin.read(), msgdata={'listname': listname, 'toconfirm': 1, '_plaintext': 1})
 
 
 

scripts/join

@@ -54,7 +54,7 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     cmdq = get_switchboard(mm_cfg.CMDQUEUE_DIR)
-    cmdq.enqueue(sys.stdin.read(), listname=listname, tojoin=1, _plaintext=1)
+    cmdq.enqueue(sys.stdin.read(), msgdata={'listname': listname, 'tojoin': 1, '_plaintext': 1})
 
 
 

scripts/leave

@@ -37,7 +37,6 @@ from Mailman.Logging.Utils import LogStdErr
 LogStdErr('error', 'leave')
 
 
-
 def main():
     try:
         listname = sys.argv[1]
@@ -54,9 +53,8 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     cmdq = get_switchboard(mm_cfg.CMDQUEUE_DIR)
-    cmdq.enqueue(sys.stdin.read(), listname=listname, toleave=1, _plaintext=1)
+    cmdq.enqueue(sys.stdin.read(), msgdata={'listname': listname, 'toleave': 1, '_plaintext': 1})
 
 
-
 if __name__ == '__main__':
     main()

scripts/owner

@@ -56,11 +56,13 @@ def main():
     # the purpose of delivering to the list owners.
     inq = get_switchboard(mm_cfg.INQUEUE_DIR)
     inq.enqueue(sys.stdin.read(),
-                listname=listname,
-                _plaintext=1,
-                envsender=Utils.get_site_email(extra='bounces'),
-                pipeline=mm_cfg.OWNER_PIPELINE,
-                toowner=1)
+                msgdata={
+                    'listname': listname,
+                    '_plaintext': 1,
+                    'envsender': Utils.get_site_email(extra='bounces'),
+                    'pipeline': mm_cfg.OWNER_PIPELINE,
+                    'toowner': 1
+                })
 
 
 

scripts/post

@@ -73,8 +73,9 @@ def main():
     # no chance to save the message.
     inq = get_switchboard(mm_cfg.INQUEUE_DIR)
     qfile = inq.enqueue(msgtext,
-                       listname=listname,
-                       tolist=1, _plaintext=1)
+                       msgdata={'listname': listname,
+                               'tolist': 1,
+                               '_plaintext': 1})
     # Log the queue file information
     mailman_log('post', 'message queued to %s, qfile: %s, full path: %s',
            mm_cfg.INQUEUE_DIR, qfile, os.path.join(mm_cfg.INQUEUE_DIR, qfile))