aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-11-23 13:27:00 -0800
committerMark Sapiro <mark@msapiro.net>2016-11-23 13:27:00 -0800
commit6e90f0855eea0c2f23deefbf9f478de478619933 (patch)
tree77ed589e915b98d182e5a31878fd5ba60db081b3
parent38575a69e772c1f35089b780c8317d9e8c4adf5f (diff)
downloadmailman2-6e90f0855eea0c2f23deefbf9f478de478619933.tar.gz
mailman2-6e90f0855eea0c2f23deefbf9f478de478619933.tar.xz
mailman2-6e90f0855eea0c2f23deefbf9f478de478619933.zip
Fixed UnicodeError in sending digests following changing list's preferred_language.
-rw-r--r--Mailman/Handlers/ToDigest.py17
-rw-r--r--NEWS3
2 files changed, 17 insertions, 3 deletions
diff --git a/Mailman/Handlers/ToDigest.py b/Mailman/Handlers/ToDigest.py
index 2027a46c..02965f82 100644
--- a/Mailman/Handlers/ToDigest.py
+++ b/Mailman/Handlers/ToDigest.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2016 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
@@ -68,6 +68,17 @@ except NameError:
+def to_cset_out(text, lcset):
+ # Convert text from unicode or lcset to output cset.
+ ocset = Charset(lcset).get_output_charset() or lcset
+ if isinstance(text, unicode):
+ return text.encode(ocset, errors='replace')
+ else:
+ return text.decode(lcset, errors='replace').encode(ocset,
+ errors='replace')
+
+
+
def process(mlist, msg, msgdata):
# Short circuit non-digestable lists.
if not mlist.digestable or msgdata.get('isdigest'):
@@ -299,7 +310,7 @@ def send_i18n_digests(mlist, mboxfp):
if msgcount == 0:
# Why did we even get here?
return
- toctext = toc.getvalue()
+ toctext = to_cset_out(toc.getvalue(), lcset)
# MIME
tocpart = MIMEText(toctext, _charset=lcset)
tocpart['Content-Description']= _("Today's Topics (%(msgcount)d messages)")
@@ -412,7 +423,7 @@ def send_i18n_digests(mlist, mboxfp):
listname=mlist.internal_name(),
isdigest=True)
# RFC 1153
- rfc1153msg.set_payload(plainmsg.getvalue(), lcset)
+ rfc1153msg.set_payload(to_cset_out(plainmsg.getvalue(), lcset), lcset)
virginq.enqueue(rfc1153msg,
recips=plainrecips,
listname=mlist.internal_name(),
diff --git a/NEWS b/NEWS
index 4946ae24..0dfc6630 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - Fixed an issue causing UnicodeError in sending digests following a
+ change of a list's preferred_language. (LP: #1644356)
+
- Enhanced the fix for race conditions in MailList().Load(). (LP: #266464)
- Fixed a typo in Utils.py that could have resulted in a NameError in