Merge smtp_direct.py rework branch.

6 files changed, 14 insertions, 14 deletions

diff --git a/src/mailman/queue/bounce.py b/src/mailman/queue/bounce.py
index c966729bb..3d2ef6140 100644
--- a/src/mailman/queue/bounce.py
+++ b/src/mailman/queue/bounce.py
@@ -181,7 +181,7 @@ class BounceRunner(Runner, BounceMixin):
             # get stuck in a bounce loop.
             config.switchboards['out'].enqueue(
                 msg, msgdata,
-                recips=[config.mailman.site_owner],
+                recipients=[config.mailman.site_owner],
                 envsender=config.mailman.noreply_address,
                 )
         # List isn't doing bounce processing?
diff --git a/src/mailman/queue/digest.py b/src/mailman/queue/digest.py
index 30705b8be..3dbfc7917 100644
--- a/src/mailman/queue/digest.py
+++ b/src/mailman/queue/digest.py
@@ -360,10 +360,10 @@ class DigestRunner(Runner):
         # Send the digests to the virgin queue for final delivery.
         queue = config.switchboards['virgin']
         queue.enqueue(mime,
-                      recips=mime_recipients,
+                      recipients=mime_recipients,
                       listname=mlist.fqdn_listname,
                       isdigest=True)
         queue.enqueue(rfc1153,
-                      recips=rfc1153_recipients,
+                      recipients=rfc1153_recipients,
                       listname=mlist.fqdn_listname,
                       isdigest=True)
diff --git a/src/mailman/queue/docs/command.txt b/src/mailman/queue/docs/command.txt
index 73be64de0..ae5b2612d 100644
--- a/src/mailman/queue/docs/command.txt
+++ b/src/mailman/queue/docs/command.txt
@@ -60,7 +60,7 @@ And now the response is in the virgin queue.
     <BLANKLINE>
     >>> sorted(item.msgdata.items())
     [..., ('listname', u'test@example.com'), ...,
-     ('recips', [u'aperson@example.com']),
+     ('recipients', [u'aperson@example.com']),
      ...]
 
 
diff --git a/src/mailman/queue/docs/digester.txt b/src/mailman/queue/docs/digester.txt
index c61f0fe3d..55f93cf40 100644
--- a/src/mailman/queue/docs/digester.txt
+++ b/src/mailman/queue/docs/digester.txt
@@ -522,12 +522,12 @@ and the other is the RFC 1153 digest.
 
 Only wperson and xperson get the MIME digests.
 
-    >>> sorted(mime.msgdata['recips'])
+    >>> sorted(mime.msgdata['recipients'])
     [u'wperson@example.com', u'xperson@example.com']
 
 Only yperson and zperson get the RFC 1153 digests.
 
-    >>> sorted(rfc1153.msgdata['recips'])
+    >>> sorted(rfc1153.msgdata['recipients'])
     [u'yperson@example.com', u'zperson@example.com']
 
 Now uperson decides that they would like to start receiving digests too.
@@ -541,10 +541,10 @@ Now uperson decides that they would like to start receiving digests too.
     2
 
     >>> mime, rfc1153 = mime_rfc1153(messages)
-    >>> sorted(mime.msgdata['recips'])
+    >>> sorted(mime.msgdata['recipients'])
     [u'uperson@example.com', u'wperson@example.com', u'xperson@example.com']
 
-    >>> sorted(rfc1153.msgdata['recips'])
+    >>> sorted(rfc1153.msgdata['recipients'])
     [u'yperson@example.com', u'zperson@example.com']
 
 At this point, both uperson and wperson decide that they'd rather receive
@@ -566,10 +566,10 @@ as much and does not want to receive one last digest.
     2
 
     >>> mime, rfc1153 = mime_rfc1153(messages)
-    >>> sorted(mime.msgdata['recips'])
+    >>> sorted(mime.msgdata['recipients'])
     [u'uperson@example.com', u'xperson@example.com']
 
-    >>> sorted(rfc1153.msgdata['recips'])
+    >>> sorted(rfc1153.msgdata['recipients'])
     [u'yperson@example.com', u'zperson@example.com']
 
 Since uperson has received their last digest, they will not get any more of
@@ -583,8 +583,8 @@ them.
     2
 
     >>> mime, rfc1153 = mime_rfc1153(messages)
-    >>> sorted(mime.msgdata['recips'])
+    >>> sorted(mime.msgdata['recipients'])
     [u'xperson@example.com']
 
-    >>> sorted(rfc1153.msgdata['recips'])
+    >>> sorted(rfc1153.msgdata['recipients'])
     [u'yperson@example.com', u'zperson@example.com']
diff --git a/src/mailman/queue/docs/incoming.txt b/src/mailman/queue/docs/incoming.txt
index 8635f2872..74326820f 100644
--- a/src/mailman/queue/docs/incoming.txt
+++ b/src/mailman/queue/docs/incoming.txt
@@ -195,7 +195,7 @@ tests above.
     >>> dump_msgdata(item.msgdata)
     _parsemsg           : False
     ...
-    recips              : [u'aperson@example.com']
+    recipients          : [u'aperson@example.com']
     ...
 
     >>> fp.seek(file_pos)
diff --git a/src/mailman/queue/outgoing.py b/src/mailman/queue/outgoing.py
index e64e8c57b..7776b1b54 100644
--- a/src/mailman/queue/outgoing.py
+++ b/src/mailman/queue/outgoing.py
@@ -118,7 +118,7 @@ class OutgoingRunner(Runner, BounceMixin):
                             config.mta.delivery_retry_period)
                     msgdata['last_recip_count'] = len(recips)
                     msgdata['deliver_until'] = deliver_until
-                    msgdata['recips'] = recips
+                    msgdata['recipients'] = recips
                     self._retryq.enqueue(msg, msgdata)
         # We've successfully completed handling of this message
         return False