diff options
| author | tkikuchi <> | 2006-01-29 05:12:26 +0000 |
|---|---|---|
| committer | tkikuchi <> | 2006-01-29 05:12:26 +0000 |
| commit | d29d50fa39e93dc4faeeb97ad18f3d60abe4b2e8 (patch) | |
| tree | 73f8e820815f5ae5a7d7b386c86d79ec5fe4cabc /Mailman/Handlers/Decorate.py | |
| parent | aeaa447be7a74887c2b8264aea10172131672386 (diff) | |
| download | mailman2-d29d50fa39e93dc4faeeb97ad18f3d60abe4b2e8.tar.gz mailman2-d29d50fa39e93dc4faeeb97ad18f3d60abe4b2e8.tar.xz mailman2-d29d50fa39e93dc4faeeb97ad18f3d60abe4b2e8.zip | |
Back out Revision 2.18.2.19 patch for email.Message.set_payload() bug
because it is overwrapped in Mailman.Message.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Handlers/Decorate.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index a5df4010..41db3950 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.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 @@ -98,12 +98,7 @@ def process(mlist, msg, msgdata): uheader = unicode(header, lcset) ufooter = unicode(footer, lcset) try: - # First, check if the message was Scrubber-munged - if msg.get('x-mailman-scrubbed'): - decode = False - else: - decode = True - oldpayload = unicode(msg.get_payload(decode=decode), mcset) + oldpayload = unicode(msg.get_payload(decode=True), mcset) frontsep = endsep = u'' if header and not header.endswith('\n'): frontsep = u'\n' |