------------------------------------------------------------
revno: 1368
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Sun 2015-01-04 19:04:43 -0800
message:
Add some explanitory comments for why we defer some Munge From changes
to WrapMessage.
Correct a misplaced item in NEWS.
modified:
Mailman/Handlers/CookHeaders.py
Mailman/Handlers/WrapMessage.py
NEWS
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Handlers/CookHeaders.py'
--- Mailman/Handlers/CookHeaders.py 2015-01-04 02:26:40 +0000
+++ Mailman/Handlers/CookHeaders.py 2015-01-05 03:04:43 +0000
@@ -72,6 +72,11 @@
(msgdata.get('from_is_list') == 0 and mlist.from_is_list == 2)) and
not msgdata.get('_fasttrack')
) or name.lower() in ('from', 'reply-to', 'cc'):
+ # The or name.lower() in ... above is because when we are munging
+ # the From:, we want to defer the resultant changes to From:,
+ # Reply-To:, and/or Cc: until after the message passes through
+ # ToDigest, ToArchive and ToUsenet. Thus, we put them in
+ # msgdata[add_header] here and apply them in WrapMessage.
msgdata.setdefault('add_header', {})[name] = value
elif repl or not msg.has_key(name):
if delete:
=== modified file 'Mailman/Handlers/WrapMessage.py'
--- Mailman/Handlers/WrapMessage.py 2015-01-04 02:26:40 +0000
+++ Mailman/Handlers/WrapMessage.py 2015-01-05 03:04:43 +0000
@@ -18,7 +18,7 @@
"""Wrap the message in an outer message/rfc822 part and transfer/add
some headers from the original.
-Also, in the case of Munge From, replace the From: and Reply-To: in the
+Also, in the case of Munge From, replace the From:, Reply-To: and Cc: in the
original message.
"""
@@ -40,7 +40,8 @@
# is wrap this message or from_is_list applies and is wrap.
if not (msgdata.get('from_is_list') == 2 or
(mlist.from_is_list == 2 and msgdata.get('from_is_list') == 0)):
- # Now see if we need to add a From: and/or Reply-To: without wrapping.
+ # Now see if we need to add a From:, Reply-To: or Cc: without wrapping.
+ # See comments in CookHeaders.change_header for why we do this here.
a_h = msgdata.get('add_header')
if a_h:
if a_h.get('From'):
=== modified file 'NEWS'
--- NEWS 2015-01-04 02:26:40 +0000
+++ NEWS 2015-01-05 03:04:43 +0000
@@ -51,12 +51,12 @@
2.1.19 (xx-xxx-xxxx)
+ New Features
+
- There is a new DEFAULT_SUBSCRIBE_OR_INVITE setting. Set this to Yes
to make the default selection on the admin Mass Subscriptions page
Invite rather than Subscribe. (LP: #1404511)
- New Features
-
- There is a new list attribute in the Bounce processing section.
bounce_notify_owner_on_bounce_increment if set to Yes will cause
Mailman to notify the list owner on every bounce that increments a
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
