diff options
Diffstat (limited to 'Mailman/Handlers/ToDigest.py')
| -rw-r--r-- | Mailman/Handlers/ToDigest.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Mailman/Handlers/ToDigest.py b/Mailman/Handlers/ToDigest.py index cd96b5a6..b0f948ac 100644 --- a/Mailman/Handlers/ToDigest.py +++ b/Mailman/Handlers/ToDigest.py @@ -32,6 +32,7 @@ import time from types import ListType from cStringIO import StringIO +from email import message_from_string from email.Parser import Parser from email.Generator import Generator from email.MIMEBase import MIMEBase @@ -334,8 +335,14 @@ def send_i18n_digests(mlist, mboxfp): uh = '\n\t'.join(uh.split('\n')) print >> plainmsg, uh print >> plainmsg - payload = msg.get_payload(decode=True)\ - or msg.as_string().split('\n\n',1)[1] + if msg.get('x-mailman-scrubbed'): + # It has successfully been scrubbed, so this should be string. + payload = msg.get_payload() + else: + # If decoded payload is empty, this may be multipart message. + # -- just stringfy it. + payload = msg.get_payload(decode=True)\ + or msg.as_string().split('\n\n',1)[1] mcset = msg.get_content_charset('') if mcset and mcset <> lcset and mcset <> lcset_out: try: @@ -407,6 +414,8 @@ def send_i18n_digests(mlist, mboxfp): isdigest=True) # RFC 1153 rfc1153msg.set_payload(plainmsg.getvalue(), lcset) + # Re-generate it because set_payload() doesn't encode. :-( + rfc1153msg = message_from_string(rfc1153msg.as_string(), Message.Message) virginq.enqueue(rfc1153msg, recips=plainrecips, listname=mlist.internal_name(), |