Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18157/Mailman

Modified Files:
        Message.py 
Log Message:
Changed email package to 2.5.7. Backed out workaround set_payload() method
from Message.py

Index: Message.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Message.py,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- Message.py  29 Jan 2006 05:07:46 -0000      2.32
+++ Message.py  6 Mar 2006 18:24:59 -0000       2.33
@@ -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 @@
         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):

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to