diff options
| author | klm | 1998-04-27 20:12:04 +0000 |
|---|---|---|
| committer | klm | 1998-04-27 20:12:04 +0000 |
| commit | 37231473adb84cd2832abd91adabe8c890169231 (patch) | |
| tree | 0b7f15e01d632c58dd7c69093ebf1aaf8a1dc1ea | |
| parent | 5df94240ba8cb583edcc7ead19fc4bb70f6f28fa (diff) | |
| download | mailman-37231473adb84cd2832abd91adabe8c890169231.tar.gz mailman-37231473adb84cd2832abd91adabe8c890169231.tar.zst mailman-37231473adb84cd2832abd91adabe8c890169231.zip | |
Using new OutgoingMessage.__delitem__ method.
| -rw-r--r-- | Mailman/Deliverer.py | 12 | ||||
| -rw-r--r-- | modules/mm_deliver.py | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py index 150deb60a..48feee339 100644 --- a/Mailman/Deliverer.py +++ b/Mailman/Deliverer.py @@ -1,6 +1,6 @@ """Mixin class with message delivery routines.""" -__version__ = "$Revision: 457 $" +__version__ = "$Revision: 475 $" import string, os, sys, tempfile @@ -97,7 +97,7 @@ class Deliverer: def QuotePeriods(self, text): return string.join(string.split(text, '\n.\n'), '\n .\n') def DeliverToList(self, msg, recipients, header, footer, remove_to=0, - tmpfile_prefix = ""): + tmpfile_prefix = ""): if not(len(recipients)): return # repr(recipient) necessary for addresses containing "'" quotes! @@ -113,16 +113,16 @@ class Deliverer: if remove_to: # Writing to a file is better than waiting for sendmail to exit tempfile.template = tmpfile_prefix +'mailman-digest.' - for item in msg.headers: - if (item[0:3] == 'To:' or - item[0:5] == 'X-To:'): - msg.headers.remove(item) + del msg['to'] + del msg['x-to'] msg.headers.append('To: %s\n' % self.GetListEmail()) else: tempfile.template = tmpfile_prefix + 'mailman.' if self.reply_goes_to_list: + del msg['reply-to'] msg.headers.append('Reply-To: %s\n' % self.GetListEmail()) msg.headers.append('Errors-To: %s\n' % self.GetAdminEmail()) + msg.headers.append('X-BeenThere: %s\n' % self.GetListEmail()) tmp_file_name = tempfile.mktemp() tmp_file = open(tmp_file_name, 'w+') diff --git a/modules/mm_deliver.py b/modules/mm_deliver.py index 150deb60a..48feee339 100644 --- a/modules/mm_deliver.py +++ b/modules/mm_deliver.py @@ -1,6 +1,6 @@ """Mixin class with message delivery routines.""" -__version__ = "$Revision: 457 $" +__version__ = "$Revision: 475 $" import string, os, sys, tempfile @@ -97,7 +97,7 @@ class Deliverer: def QuotePeriods(self, text): return string.join(string.split(text, '\n.\n'), '\n .\n') def DeliverToList(self, msg, recipients, header, footer, remove_to=0, - tmpfile_prefix = ""): + tmpfile_prefix = ""): if not(len(recipients)): return # repr(recipient) necessary for addresses containing "'" quotes! @@ -113,16 +113,16 @@ class Deliverer: if remove_to: # Writing to a file is better than waiting for sendmail to exit tempfile.template = tmpfile_prefix +'mailman-digest.' - for item in msg.headers: - if (item[0:3] == 'To:' or - item[0:5] == 'X-To:'): - msg.headers.remove(item) + del msg['to'] + del msg['x-to'] msg.headers.append('To: %s\n' % self.GetListEmail()) else: tempfile.template = tmpfile_prefix + 'mailman.' if self.reply_goes_to_list: + del msg['reply-to'] msg.headers.append('Reply-To: %s\n' % self.GetListEmail()) msg.headers.append('Errors-To: %s\n' % self.GetAdminEmail()) + msg.headers.append('X-BeenThere: %s\n' % self.GetListEmail()) tmp_file_name = tempfile.mktemp() tmp_file = open(tmp_file_name, 'w+') |