aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-07-14 05:22:51 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-07-14 05:22:51 +0900
commit8cac32e5bac4495139573b07da94c255522e8498 (patch)
treeb84145fc30188f2ba2daad665a552e5f7b6cd8b2 /Mailman
parentcf3173589c879179e0f4c5eb9763f415d14b3d8f (diff)
parentde6ffbe5a0ce37751247b071b75aa7c8e6605c58 (diff)
downloadmailman2-8cac32e5bac4495139573b07da94c255522e8498.tar.gz
mailman2-8cac32e5bac4495139573b07da94c255522e8498.tar.xz
mailman2-8cac32e5bac4495139573b07da94c255522e8498.zip
Merge lp:mailman/2.1 up to 1662
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Handlers/SpamDetect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py
index 1ea295a6..de19adfc 100644
--- a/Mailman/Handlers/SpamDetect.py
+++ b/Mailman/Handlers/SpamDetect.py
@@ -86,7 +86,7 @@ def getDecodedHeaders(msg, cset='utf-8'):
# unicode it as iso-8859-1 which may result in a garbled
# mess, but we have to do something.
uvalue += unicode(frag, 'iso-8859-1', 'replace')
- headers += '%s: %s\n' % (h, uvalue.encode(cset, 'backslashreplace'))
+ headers += '%s: %s\n' % (h, uvalue.encode(cset, 'xmlcharrefreplace'))
return headers