aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authormsapiro <>2006-03-06 18:21:52 +0000
committermsapiro <>2006-03-06 18:21:52 +0000
commit8b1d892033cbded1e551811389d37b14317388e6 (patch)
tree5ba3c6dcf9dc9ac7c12968d696dbe458f5188e11 /Mailman
parent01568fe1041a0002160a962526c1203bf65d2fc3 (diff)
downloadmailman2-8b1d892033cbded1e551811389d37b14317388e6.tar.gz
mailman2-8b1d892033cbded1e551811389d37b14317388e6.tar.xz
mailman2-8b1d892033cbded1e551811389d37b14317388e6.zip
Changed email package to 2.5.7. Backed out workaround set_payload() method
from Message.py
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Message.py13
1 files changed, 1 insertions, 12 deletions
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):