Update of /cvsroot/mailman/mailman/Mailman/Archiver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14027/Archiver
Modified Files:
Tag: Release_2_1-maint
HyperArch.py pipermail.py
Log Message:
Back out Revision 2.18.2.19 patch for email.Message.set_payload() bug
because it is overwrapped in Mailman.Message.
Index: HyperArch.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Archiver/HyperArch.py,v
retrieving revision 2.37.2.20
retrieving revision 2.37.2.21
diff -u -d -r2.37.2.20 -r2.37.2.21
--- HyperArch.py 9 Jan 2006 07:33:36 -0000 2.37.2.20
+++ HyperArch.py 29 Jan 2006 05:12:26 -0000 2.37.2.21
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -304,12 +304,7 @@
if charset[0]=="'" and charset[-1]=="'":
charset = charset[1:-1]
try:
- # Check Scrubber-munged payload
- if message.get('x-mailman-scrubbed'):
- decode = False
- else:
- decode = True
- body = message.get_payload(decode=decode)
+ body = message.get_payload(decode=True)
except binascii.Error:
body = None
if body and charset != Utils.GetCharSet(self._lang):
Index: pipermail.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Archiver/pipermail.py,v
retrieving revision 2.22.2.8
retrieving revision 2.22.2.9
diff -u -d -r2.22.2.8 -r2.22.2.9
--- pipermail.py 26 Dec 2005 01:22:08 -0000 2.22.2.8
+++ pipermail.py 29 Jan 2006 05:12:26 -0000 2.22.2.9
@@ -224,12 +224,7 @@
self.headers[i] = message[i]
# Read the message body
- # Check Scrubber-munged paylaod
- if message.get('x-mailman-scrubbed'):
- decode = False
- else:
- decode = True
- s = StringIO(message.get_payload(decode=decode)\
+ s = StringIO(message.get_payload(decode=True)\
or message.as_string().split('\n\n',1)[1])
self.body = s.readlines()
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
