From d29d50fa39e93dc4faeeb97ad18f3d60abe4b2e8 Mon Sep 17 00:00:00 2001
From: tkikuchi <>
Date: Sun, 29 Jan 2006 05:12:26 +0000
Subject: Back out Revision 2.18.2.19 patch for email.Message.set_payload() bug
 because it is overwrapped in Mailman.Message.

---
 Mailman/Archiver/HyperArch.py | 9 ++-------
 Mailman/Archiver/pipermail.py | 7 +------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'Mailman/Archiver')

diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py
index bd3802bc..0245f21b 100644
--- a/Mailman/Archiver/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -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 @@ class Article(pipermail.Article):
             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):
diff --git a/Mailman/Archiver/pipermail.py b/Mailman/Archiver/pipermail.py
index ec5abaff..49de805b 100644
--- a/Mailman/Archiver/pipermail.py
+++ b/Mailman/Archiver/pipermail.py
@@ -224,12 +224,7 @@ class Article:
                 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()
 
-- 
cgit v1.2.3