summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mailman/archiving/mailarchive.py2
-rw-r--r--src/mailman/docs/pipelines.txt6
-rw-r--r--src/mailman/docs/registration.txt2
-rw-r--r--src/mailman/docs/requests.txt26
-rw-r--r--src/mailman/email/message.py4
-rw-r--r--src/mailman/mta/docs/bulk.txt1
-rw-r--r--src/mailman/mta/docs/verp.txt1
-rw-r--r--src/mailman/pipeline/docs/acknowledge.txt4
-rw-r--r--src/mailman/pipeline/docs/avoid-duplicates.txt5
-rw-r--r--src/mailman/pipeline/docs/decorate.txt21
-rw-r--r--src/mailman/testing/layers.py2
11 files changed, 26 insertions, 48 deletions
diff --git a/src/mailman/archiving/mailarchive.py b/src/mailman/archiving/mailarchive.py
index a5eb27db0..b3d7f4506 100644
--- a/src/mailman/archiving/mailarchive.py
+++ b/src/mailman/archiving/mailarchive.py
@@ -84,4 +84,4 @@ class MailArchive:
config.switchboards['out'].enqueue(
msg,
listname=mlist.fqdn_listname,
- recips=[config.archiver.mail_archive.recipient])
+ recipients=[config.archiver.mail_archive.recipient])
diff --git a/src/mailman/docs/pipelines.txt b/src/mailman/docs/pipelines.txt
index 5ad6ba243..51dfd7a61 100644
--- a/src/mailman/docs/pipelines.txt
+++ b/src/mailman/docs/pipelines.txt
@@ -66,7 +66,7 @@ However there are currently no recipients for this message.
>>> dump_msgdata(msgdata)
original_sender : aperson@example.com
origsubj : My first post
- recips : set([])
+ recipients : set([])
stripped_subject: My first post
And the message is now sitting in various other processing queues.
@@ -103,7 +103,7 @@ And the message is now sitting in various other processing queues.
_parsemsg : False
original_sender : aperson@example.com
origsubj : My first post
- recips : set([])
+ recipients : set([])
stripped_subject: My first post
version : 3
@@ -148,7 +148,7 @@ This is the message that will actually get delivered to end recipients.
listname : xtest@example.com
original_sender : aperson@example.com
origsubj : My first post
- recips : set([])
+ recipients : set([])
stripped_subject: My first post
version : 3
diff --git a/src/mailman/docs/registration.txt b/src/mailman/docs/registration.txt
index 09cc790ea..6b1ff0c18 100644
--- a/src/mailman/docs/registration.txt
+++ b/src/mailman/docs/registration.txt
@@ -158,7 +158,7 @@ message is sent to the user in order to verify the registered address.
>>> dump_msgdata(qdata)
_parsemsg : False
nodecorate : True
- recips : [u'aperson@example.com']
+ recipients : [u'aperson@example.com']
reduced_list_headers: True
version : 3
diff --git a/src/mailman/docs/requests.txt b/src/mailman/docs/requests.txt
index 0113e2274..5dcfa922a 100644
--- a/src/mailman/docs/requests.txt
+++ b/src/mailman/docs/requests.txt
@@ -299,7 +299,7 @@ The message can be rejected, meaning it is bounced back to the sender.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'aperson@example.org']
+ recipients : [u'aperson@example.org']
reduced_list_headers: True
version : 3
@@ -404,7 +404,7 @@ moderators.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'zperson@example.com']
+ recipients : [u'zperson@example.com']
reduced_list_headers: True
version : 3
@@ -474,7 +474,7 @@ queue when the message is held.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'alist-owner@example.com']
+ recipients : [u'alist-owner@example.com']
reduced_list_headers: True
tomoderators : True
version : 3
@@ -529,7 +529,7 @@ subscriber.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'cperson@example.org']
+ recipients : [u'cperson@example.org']
reduced_list_headers: True
version : 3
@@ -573,7 +573,7 @@ subscription and the fact that they may need to approve it.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'alist-owner@example.com']
+ recipients : [u'alist-owner@example.com']
reduced_list_headers: True
tomoderators : True
version : 3
@@ -590,7 +590,7 @@ at the recipient list.
>>> qmsg_1, qdata_1 = dequeue(expected_count=2)
>>> qmsg_2, qdata_2 = dequeue()
- >>> if 'fperson@example.org' in qdata_1['recips']:
+ >>> if 'fperson@example.org' in qdata_1['recipients']:
... # The first message is the welcome message
... welcome_qmsg = qmsg_1
... welcome_qdata = qdata_1
@@ -646,7 +646,7 @@ The welcome message is sent to the person who just subscribed.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'fperson@example.org']
+ recipients : [u'fperson@example.org']
reduced_list_headers: True
verp : False
version : 3
@@ -672,7 +672,7 @@ The admin message is sent to the moderators.
envsender : changeme@example.com
listname : alist@example.com
nodecorate : True
- recips : []
+ recipients : []
reduced_list_headers: True
version : 3
@@ -752,7 +752,7 @@ unsubscription holds can send the list's moderators an immediate notification.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'alist-owner@example.com']
+ recipients : [u'alist-owner@example.com']
reduced_list_headers: True
tomoderators : True
version : 3
@@ -810,7 +810,7 @@ and the person remains a member of the mailing list.
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'hperson@example.com']
+ recipients : [u'hperson@example.com']
reduced_list_headers: True
version : 3
@@ -834,7 +834,7 @@ change.
>>> qmsg_1, qdata_1 = dequeue(expected_count=2)
>>> qmsg_2, qdata_2 = dequeue()
- >>> if 'gperson@example.com' in qdata_1['recips']:
+ >>> if 'gperson@example.com' in qdata_1['recipients']:
... # The first message is the goodbye message
... goodbye_qmsg = qmsg_1
... goodbye_qdata = qdata_1
@@ -865,7 +865,7 @@ The goodbye message...
_parsemsg : False
listname : alist@example.com
nodecorate : True
- recips : [u'gperson@example.com']
+ recipients : [u'gperson@example.com']
reduced_list_headers: True
verp : False
version : 3
@@ -890,6 +890,6 @@ The goodbye message...
envsender : changeme@example.com
listname : alist@example.com
nodecorate : True
- recips : []
+ recipients : []
reduced_list_headers: True
version : 3
diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py
index 984c58c76..458f4070c 100644
--- a/src/mailman/email/message.py
+++ b/src/mailman/email/message.py
@@ -204,7 +204,7 @@ class UserNotification(Message):
virginq = config.switchboards['virgin']
# The message metadata better have a 'recip' attribute.
enqueue_kws = dict(
- recips=self.recips,
+ recipients=self.recips,
nodecorate=True,
reduced_list_headers=True,
)
@@ -242,7 +242,7 @@ class OwnerNotification(UserNotification):
# The message metadata better have a `recip' attribute
virginq.enqueue(self,
listname=mlist.fqdn_listname,
- recips=self.recips,
+ recipients=self.recips,
nodecorate=True,
reduced_list_headers=True,
envsender=self._sender,
diff --git a/src/mailman/mta/docs/bulk.txt b/src/mailman/mta/docs/bulk.txt
index e40bdce16..99f58e7a7 100644
--- a/src/mailman/mta/docs/bulk.txt
+++ b/src/mailman/mta/docs/bulk.txt
@@ -142,7 +142,6 @@ Bulk delivery
The set of recipients for bulk delivery comes from the message metadata. If
there are no calculated recipients, nothing gets sent.
- >>> smtpd.clear()
>>> mlist = create_list('test@example.com')
>>> msg = message_from_string("""\
... From: aperson@example.org
diff --git a/src/mailman/mta/docs/verp.txt b/src/mailman/mta/docs/verp.txt
index 11157d363..c7c14e714 100644
--- a/src/mailman/mta/docs/verp.txt
+++ b/src/mailman/mta/docs/verp.txt
@@ -41,7 +41,6 @@ No recipients
The message metadata specifies the set of recipients to send this message to.
If there are no recipients, there's nothing to do.
- >>> smtpd.clear()
>>> mlist = create_list('test@example.com')
>>> msg = message_from_string("""\
... From: aperson@example.org
diff --git a/src/mailman/pipeline/docs/acknowledge.txt b/src/mailman/pipeline/docs/acknowledge.txt
index 3b8316cab..c304bd8bf 100644
--- a/src/mailman/pipeline/docs/acknowledge.txt
+++ b/src/mailman/pipeline/docs/acknowledge.txt
@@ -110,7 +110,7 @@ The receipt will include the original message's subject in the response body,
>>> virginq.files
[]
>>> sorted(qdata.items())
- [..., ('recips', [u'aperson@example.com']), ...]
+ [..., ('recipients', [u'aperson@example.com']), ...]
>>> print qmsg.as_string()
...
MIME-Version: 1.0
@@ -144,7 +144,7 @@ If there is no subject, then the receipt will use a generic message.
>>> virginq.files
[]
>>> sorted(qdata.items())
- [..., ('recips', [u'aperson@example.com']), ...]
+ [..., ('recipients', [u'aperson@example.com']), ...]
>>> print qmsg.as_string()
MIME-Version: 1.0
...
diff --git a/src/mailman/pipeline/docs/avoid-duplicates.txt b/src/mailman/pipeline/docs/avoid-duplicates.txt
index b6d0133fd..1493c4d04 100644
--- a/src/mailman/pipeline/docs/avoid-duplicates.txt
+++ b/src/mailman/pipeline/docs/avoid-duplicates.txt
@@ -24,7 +24,8 @@ Create some members we're going to use.
>>> member_b = address_b.subscribe(mlist, MemberRole.member)
>>> # This is the message metadata dictionary as it would be produced by
>>> # the CalcRecips handler.
- >>> recips = dict(recips=['aperson@example.com', 'bperson@example.com'])
+ >>> recips = dict(
+ ... recipients=['aperson@example.com', 'bperson@example.com'])
Short circuiting
@@ -126,7 +127,7 @@ Other headers checked for recipients include the To...
... """)
>>> msgdata = recips.copy()
>>> handler.process(mlist, msg, msgdata)
- >>> sorted(msgdata['recips'])
+ >>> sorted(msgdata['recipients'])
[u'bperson@example.com']
>>> print msg.as_string()
From: Claire Person <cperson@example.com>
diff --git a/src/mailman/pipeline/docs/decorate.txt b/src/mailman/pipeline/docs/decorate.txt
index 78b500409..246e67096 100644
--- a/src/mailman/pipeline/docs/decorate.txt
+++ b/src/mailman/pipeline/docs/decorate.txt
@@ -295,24 +295,3 @@ that the header and footer can be added as attachments.
<BLANKLINE>
footer
--BOUNDARY--
-
-
-Personalization
-===============
-
-A mailing list can be 'personalized', meaning that each message is unique for
-each recipient. When the list is personalized, additional interpolation
-variables are available, however the list of intended recipients must be
-provided in the message data, otherwise an exception occurs.
-
- >>> process(mlist, None, dict(personalize=True))
- Traceback (most recent call last):
- ...
- AssertionError: The number of intended recipients must be exactly 1
-
-And the number of intended recipients must be exactly 1.
-
- >>> process(mlist, None, dict(personalize=True, recipients=[1, 2, 3]))
- Traceback (most recent call last):
- ...
- AssertionError: The number of intended recipients must be exactly 1
diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py
index 70b0ae9b1..4bc98161e 100644
--- a/src/mailman/testing/layers.py
+++ b/src/mailman/testing/layers.py
@@ -235,7 +235,7 @@ class SMTPLayer(ConfigLayer):
@classmethod
def testTearDown(cls):
- pass
+ cls.smtpd.clear()
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-25 12:52:07 +0000