summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Warsaw2012-03-23 13:49:46 -0400
committerBarry Warsaw2012-03-23 13:49:46 -0400
commit2e7565996c4f63d17028e04e133c851e4c935a2b (patch)
treeec89e17890ff867e609c5ec427b4d32c2841411d
parent56ebf923ff311b4c1d195d46c04cadca4940b638 (diff)
downloadmailman-2e7565996c4f63d17028e04e133c851e4c935a2b.tar.gz
mailman-2e7565996c4f63d17028e04e133c851e4c935a2b.tar.zst
mailman-2e7565996c4f63d17028e04e133c851e4c935a2b.zip
Rename the member recipients calculating handler to make way for the owner
recipients handler.
-rw-r--r--src/mailman/core/pipelines.py2
-rw-r--r--src/mailman/handlers/docs/calc-recips.rst2
-rw-r--r--src/mailman/handlers/member_recipients.py (renamed from src/mailman/handlers/calculate_recipients.py)6
-rw-r--r--src/mailman/runners/docs/outgoing.rst4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/mailman/core/pipelines.py b/src/mailman/core/pipelines.py
index 9d24cc61f..5c0eb7f71 100644
--- a/src/mailman/core/pipelines.py
+++ b/src/mailman/core/pipelines.py
@@ -98,7 +98,7 @@ class BuiltInPipeline(BasePipeline):
_default_handlers = (
'mime-delete',
'tagger',
- 'calculate-recipients',
+ 'member-recipients',
'avoid-duplicates',
'cleanse',
'cleanse-dkim',
diff --git a/src/mailman/handlers/docs/calc-recips.rst b/src/mailman/handlers/docs/calc-recips.rst
index 6dca85816..51a836c82 100644
--- a/src/mailman/handlers/docs/calc-recips.rst
+++ b/src/mailman/handlers/docs/calc-recips.rst
@@ -57,7 +57,7 @@ but not all of the recipients.
>>> recipients = set(('qperson@example.com', 'zperson@example.com'))
>>> msgdata = dict(recipients=recipients)
- >>> handler = config.handlers['calculate-recipients']
+ >>> handler = config.handlers['member-recipients']
>>> handler.process(mlist, msg, msgdata)
>>> dump_list(msgdata['recipients'])
qperson@example.com
diff --git a/src/mailman/handlers/calculate_recipients.py b/src/mailman/handlers/member_recipients.py
index 15be07ecd..421d5a1dc 100644
--- a/src/mailman/handlers/calculate_recipients.py
+++ b/src/mailman/handlers/member_recipients.py
@@ -27,7 +27,7 @@ from __future__ import absolute_import, unicode_literals
__metaclass__ = type
__all__ = [
- 'CalculateRecipients',
+ 'MemberRecipients',
]
from zope.interface import implements
@@ -41,12 +41,12 @@ from mailman.utilities.string import wrap
-class CalculateRecipients:
+class MemberRecipients:
"""Calculate the regular (i.e. non-digest) recipients of the message."""
implements(IHandler)
- name = 'calculate-recipients'
+ name = 'member-recipients'
description = _('Calculate the regular recipients of the message.')
def process(self, mlist, msg, msgdata):
diff --git a/src/mailman/runners/docs/outgoing.rst b/src/mailman/runners/docs/outgoing.rst
index b1ffb06a0..d8963ae00 100644
--- a/src/mailman/runners/docs/outgoing.rst
+++ b/src/mailman/runners/docs/outgoing.rst
@@ -33,7 +33,7 @@ move messages to the 'retry queue' for handling delivery failures.
Normally, messages would show up in the outgoing queue after the message has
been processed by the rule set and pipeline. But we can simulate that here by
injecting a message directly into the outgoing queue. First though, we must
-call the ``calculate-recipients`` handler so that the message metadata will be
+call the ``member-recipients`` handler so that the message metadata will be
populated with the list of addresses to deliver the message to.
::
@@ -47,7 +47,7 @@ populated with the list of addresses to deliver the message to.
... """)
>>> msgdata = {}
- >>> handler = config.handlers['calculate-recipients']
+ >>> handler = config.handlers['member-recipients']
>>> handler.process(mlist, msg, msgdata)
>>> outgoing_queue = config.switchboards['out']