From 8b1d892033cbded1e551811389d37b14317388e6 Mon Sep 17 00:00:00 2001
From: msapiro <>
Date: Mon, 6 Mar 2006 18:21:52 +0000
Subject: Changed email package to 2.5.7. Backed out workaround set_payload()
 method from Message.py

---
 Mailman/Message.py      |  13 +------------
 misc/Makefile.in        |   7 ++++---
 misc/email-2.5.6.tar.gz | Bin 1050210 -> 0 bytes
 misc/email-2.5.7.tar.gz | Bin 0 -> 1138518 bytes
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 misc/email-2.5.6.tar.gz
 create mode 100644 misc/email-2.5.7.tar.gz

diff --git a/Mailman/Message.py b/Mailman/Message.py
index bdf7e718..bba48421 100644
--- a/Mailman/Message.py
+++ b/Mailman/Message.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
@@ -199,17 +199,6 @@ class Message(email.Message.Message):
         except (UnicodeError, LookupError, ValueError):
             return failobj
 
-    def set_payload(self, payload, charset=None):
-        """Set the payload to the given value (Override email package).
-        Payload is converted to a MIME message body when this is called.
-        """
-        email.Message.Message.set_payload(self, payload, charset)
-        if self.get('content-transfer-encoding') in \
-                ('quoted-printable', 'base64'):
-            cset = self.get_charset()
-            if cset:
-                self._payload = cset.body_encode(self._payload)
-                self._charset = None 
 
 
 class UserNotification(Message):
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 88073ee6..0b1f5107 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -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
@@ -12,7 +12,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software 
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 # NOTE: Makefile.in is converted into Makefile by the configure script
 # in the parent directory.  Once configure has run, you can recreate
@@ -52,7 +53,7 @@ SETUPINSTOPTS=	--install-lib $(DESTDIR)$(PYTHONLIBDIR) \
 SETUPCMD=	setup.py --quiet install $(SETUPINSTOPTS)
 PKGDIR= 	$(srcdir)
 
-EMAILPKG=	email-2.5.6
+EMAILPKG=	email-2.5.7
 JACODECSPKG=	JapaneseCodecs-1.4.11
 KOCODECSPKG=	KoreanCodecs-2.0.5
 
diff --git a/misc/email-2.5.6.tar.gz b/misc/email-2.5.6.tar.gz
deleted file mode 100644
index 6dbc884d..00000000
Binary files a/misc/email-2.5.6.tar.gz and /dev/null differ
diff --git a/misc/email-2.5.7.tar.gz b/misc/email-2.5.7.tar.gz
new file mode 100644
index 00000000..3f6a4bba
Binary files /dev/null and b/misc/email-2.5.7.tar.gz differ
-- 
cgit v1.2.3