diff options
Diffstat (limited to 'src/mailman/queue')
| -rw-r--r-- | src/mailman/queue/bounce.py | 2 | ||||
| -rw-r--r-- | src/mailman/queue/digest.py | 4 | ||||
| -rw-r--r-- | src/mailman/queue/docs/command.txt | 2 | ||||
| -rw-r--r-- | src/mailman/queue/docs/digester.txt | 16 | ||||
| -rw-r--r-- | src/mailman/queue/docs/incoming.txt | 2 | ||||
| -rw-r--r-- | src/mailman/queue/outgoing.py | 18 |
6 files changed, 22 insertions, 22 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..b1adbe411 100644 --- a/src/mailman/queue/outgoing.py +++ b/src/mailman/queue/outgoing.py @@ -26,7 +26,7 @@ from datetime import datetime from lazr.config import as_timedelta from mailman.config import config -from mailman.core import errors +from mailman.interfaces.mta import SomeRecipientsFailed from mailman.queue import Runner from mailman.queue.bounce import BounceMixin from mailman.utilities.modules import find_name @@ -81,9 +81,9 @@ class OutgoingRunner(Runner, BounceMixin): config.mta.host, port) self._logged = True return True - except errors.SomeRecipientsFailed, e: + except SomeRecipientsFailed as error: # Handle local rejects of probe messages differently. - if msgdata.get('probe_token') and e.permfailures: + if msgdata.get('probe_token') and error.permanent_failures: self._probe_bounce(mlist, msgdata['probe_token']) else: # Delivery failed at SMTP time for some or all of the @@ -95,15 +95,15 @@ class OutgoingRunner(Runner, BounceMixin): # this is what's sent to the user in the probe message. Maybe # we should craft a bounce-like message containing information # about the permanent SMTP failure? - if e.permfailures: - self._queue_bounces(mlist.fqdn_listname, e.permfailures, - msg) + if error.permanent_failures: + self._queue_bounces( + mlist.fqdn_listname, error.permanent_failures, msg) # Move temporary failures to the qfiles/retry queue which will # occasionally move them back here for another shot at # delivery. - if e.tempfailures: + if error.temporary_failures: now = datetime.now() - recips = e.tempfailures + recips = error.temporary_failures last_recip_count = msgdata.get('last_recip_count', 0) deliver_until = msgdata.get('deliver_until', now) if len(recips) == last_recip_count: @@ -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 |