summaryrefslogtreecommitdiff
path: root/src/mailman/pipeline
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/pipeline')
-rw-r--r--src/mailman/pipeline/acknowledge.py8
-rw-r--r--src/mailman/pipeline/calculate_recipients.py3
-rw-r--r--src/mailman/pipeline/cook_headers.py2
-rw-r--r--src/mailman/pipeline/decorate.py2
-rw-r--r--src/mailman/pipeline/docs/cook-headers.txt4
-rw-r--r--src/mailman/pipeline/file_recipients.py3
-rw-r--r--src/mailman/pipeline/moderate.py7
-rw-r--r--src/mailman/pipeline/replybot.py19
-rw-r--r--src/mailman/pipeline/to_digest.py2
9 files changed, 23 insertions, 27 deletions
diff --git a/src/mailman/pipeline/acknowledge.py b/src/mailman/pipeline/acknowledge.py
index de520df65..2ee27a5ae 100644
--- a/src/mailman/pipeline/acknowledge.py
+++ b/src/mailman/pipeline/acknowledge.py
@@ -30,8 +30,8 @@ __all__ = [
from zope.interface import implements
-from mailman import Message
from mailman import Utils
+from mailman.email.message import Message, UserNotification
from mailman.i18n import _
from mailman.interfaces.handler import IHandler
@@ -47,7 +47,7 @@ class Acknowledge:
def process(self, mlist, msg, msgdata):
"""See `IHandler`."""
# Extract the sender's address and find them in the user database
- sender = msgdata.get('original_sender', msg.get_sender())
+ sender = msgdata.get('original_sender', msg.sender)
member = mlist.members.get_member(sender)
if member is None or not member.acknowledge_posts:
# Either the sender is not a member, in which case we can't know
@@ -75,6 +75,6 @@ class Acknowledge:
# necessary for general delivery. Then enqueue it to the outgoing
# queue.
subject = _('$realname post acknowledgment')
- usermsg = Message.UserNotification(sender, mlist.bounces_address,
- subject, text, lang)
+ usermsg = UserNotification(sender, mlist.bounces_address,
+ subject, text, lang)
usermsg.send(mlist)
diff --git a/src/mailman/pipeline/calculate_recipients.py b/src/mailman/pipeline/calculate_recipients.py
index 9837c1e6b..0850db929 100644
--- a/src/mailman/pipeline/calculate_recipients.py
+++ b/src/mailman/pipeline/calculate_recipients.py
@@ -56,8 +56,7 @@ class CalculateRecipients:
return
# Should the original sender should be included in the recipients list?
include_sender = True
- sender = msg.get_sender()
- member = mlist.members.get_member(sender)
+ member = mlist.members.get_member(msg.sender)
if member and not member.receive_own_postings:
include_sender = False
# Support for urgent messages, which bypasses digests and disabled
diff --git a/src/mailman/pipeline/cook_headers.py b/src/mailman/pipeline/cook_headers.py
index 529d7ce5d..7da413cd2 100644
--- a/src/mailman/pipeline/cook_headers.py
+++ b/src/mailman/pipeline/cook_headers.py
@@ -74,7 +74,7 @@ def process(mlist, msg, msgdata):
# message, we want to save some of the information in the msgdata
# dictionary for later. Specifically, the sender header will get waxed,
# but we need it for the Acknowledge module later.
- msgdata['original_sender'] = msg.get_sender()
+ msgdata['original_sender'] = msg.sender
# VirginRunner sets _fasttrack for internally crafted messages.
fasttrack = msgdata.get('_fasttrack')
if not msgdata.get('isdigest') and not fasttrack:
diff --git a/src/mailman/pipeline/decorate.py b/src/mailman/pipeline/decorate.py
index e1fa0c155..87313446d 100644
--- a/src/mailman/pipeline/decorate.py
+++ b/src/mailman/pipeline/decorate.py
@@ -32,8 +32,8 @@ from email.MIMEText import MIMEText
from zope.interface import implements
from mailman import Utils
-from mailman.Message import Message
from mailman.config import config
+from mailman.email.message import Message
from mailman.i18n import _
from mailman.interfaces.handler import IHandler
from mailman.utilities.string import expand
diff --git a/src/mailman/pipeline/docs/cook-headers.txt b/src/mailman/pipeline/docs/cook-headers.txt
index ce13a45b6..edbaaa133 100644
--- a/src/mailman/pipeline/docs/cook-headers.txt
+++ b/src/mailman/pipeline/docs/cook-headers.txt
@@ -39,8 +39,8 @@ But if there was no original sender, then the empty string will be saved.
... """)
>>> msgdata = {}
>>> process(mlist, msg, msgdata)
- >>> msgdata['original_sender']
- ''
+ >>> print msgdata['original_sender']
+ <BLANKLINE>
X-BeenThere header
diff --git a/src/mailman/pipeline/file_recipients.py b/src/mailman/pipeline/file_recipients.py
index 89d10d783..fd2db596a 100644
--- a/src/mailman/pipeline/file_recipients.py
+++ b/src/mailman/pipeline/file_recipients.py
@@ -58,8 +58,7 @@ class FileRecipients:
return
# If the sender is a member of the list, remove them from the file
# recipients.
- sender = msg.get_sender()
- member = mlist.members.get_member(sender)
+ member = mlist.members.get_member(msg.sender)
if member is not None:
addrs.discard(member.address.address)
msgdata['recips'] = addrs
diff --git a/src/mailman/pipeline/moderate.py b/src/mailman/pipeline/moderate.py
index 0b38c3a5a..b5bf38dc9 100644
--- a/src/mailman/pipeline/moderate.py
+++ b/src/mailman/pipeline/moderate.py
@@ -30,10 +30,10 @@ import re
from email.MIMEMessage import MIMEMessage
from email.MIMEText import MIMEText
-from mailman import Message
from mailman import Utils
from mailman.config import config
from mailman.core import errors
+from mailman.email.message import Message
from mailman.i18n import _
@@ -55,7 +55,7 @@ def process(mlist, msg, msgdata):
if msgdata.get('approved') or msgdata.get('fromusenet'):
return
# First of all, is the poster a member or not?
- for sender in msg.get_senders():
+ for sender in msg.senders:
if mlist.isMember(sender):
break
else:
@@ -92,7 +92,7 @@ def process(mlist, msg, msgdata):
# their own thing.
return
else:
- sender = msg.get_sender()
+ sender = msg.sender
# From here on out, we're dealing with non-members.
if matches_p(sender, mlist.accept_these_nonmembers):
return
@@ -154,7 +154,6 @@ error, contact the mailing list owner at %(listowner)s."""))
def do_discard(mlist, msg):
- sender = msg.get_sender()
# Do we forward auto-discards to the list owners?
if mlist.forward_auto_discards:
lang = mlist.preferred_language
diff --git a/src/mailman/pipeline/replybot.py b/src/mailman/pipeline/replybot.py
index e24777774..a204504b1 100644
--- a/src/mailman/pipeline/replybot.py
+++ b/src/mailman/pipeline/replybot.py
@@ -31,8 +31,8 @@ import datetime
from zope.interface import implements
-from mailman import Message
from mailman import Utils
+from mailman.email.message import Message, UserNotification
from mailman.i18n import _
from mailman.interfaces.handler import IHandler
from mailman.utilities.string import expand
@@ -71,16 +71,15 @@ def process(mlist, msg, msgdata):
# Now see if we're in the grace period for this sender. graceperiod <= 0
# means always autorespond, as does an "X-Ack: yes" header (useful for
# debugging).
- sender = msg.get_sender()
now = time.time()
graceperiod = mlist.autoresponse_graceperiod
if graceperiod > NODELTA and ack <> 'yes':
if toadmin:
- quiet_until = mlist.admin_responses.get(sender, 0)
+ quiet_until = mlist.admin_responses.get(msg.sender, 0)
elif torequest:
- quiet_until = mlist.request_responses.get(sender, 0)
+ quiet_until = mlist.request_responses.get(msg.sender, 0)
else:
- quiet_until = mlist.postings_responses.get(sender, 0)
+ quiet_until = mlist.postings_responses.get(msg.sender, 0)
if quiet_until > now:
return
# Okay, we know we're going to auto-respond to this sender, craft the
@@ -102,8 +101,8 @@ def process(mlist, msg, msgdata):
rtext = mlist.autoresponse_postings_text
# Interpolation and Wrap the response text.
text = Utils.wrap(expand(rtext, d))
- outmsg = Message.UserNotification(sender, mlist.bounces_address,
- subject, text, mlist.preferred_language)
+ outmsg = UserNotification(msg.sender, mlist.bounces_address,
+ subject, text, mlist.preferred_language)
outmsg['X-Mailer'] = _('The Mailman Replybot')
# prevent recursions and mail loops!
outmsg['X-Ack'] = 'No'
@@ -113,11 +112,11 @@ def process(mlist, msg, msgdata):
# graceperiod is in days, we need # of seconds
quiet_until = now + graceperiod * 24 * 60 * 60
if toadmin:
- mlist.admin_responses[sender] = quiet_until
+ mlist.admin_responses[msg.sender] = quiet_until
elif torequest:
- mlist.request_responses[sender] = quiet_until
+ mlist.request_responses[msg.sender] = quiet_until
else:
- mlist.postings_responses[sender] = quiet_until
+ mlist.postings_responses[msg.sender] = quiet_until
diff --git a/src/mailman/pipeline/to_digest.py b/src/mailman/pipeline/to_digest.py
index ebb40a77c..78d8e1970 100644
--- a/src/mailman/pipeline/to_digest.py
+++ b/src/mailman/pipeline/to_digest.py
@@ -30,8 +30,8 @@ import datetime
from zope.interface import implements
-from mailman.Message import Message
from mailman.config import config
+from mailman.email.message import Message
from mailman.i18n import _
from mailman.interfaces.handler import IHandler
from mailman.interfaces.mailinglist import DigestFrequency
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 22:03:56 +0000