diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-04-11 18:36:40 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-04-11 18:36:40 +0900 |
| commit | 4adcb27774066835546919d127c0ee341bb00208 (patch) | |
| tree | 30011132a9664c343e05108de05413fefae2914b /Mailman/Handlers/ToDigest.py | |
| parent | 21794803f456989ecdcafbe9cb395885ee24becb (diff) | |
| parent | a942e159e5c738072efa8fa8c4d7c76cc35a7db5 (diff) | |
| download | mailman2-4adcb27774066835546919d127c0ee341bb00208.tar.gz mailman2-4adcb27774066835546919d127c0ee341bb00208.tar.xz mailman2-4adcb27774066835546919d127c0ee341bb00208.zip | |
merge lp:mailman/2.1 up to rev 1750
Diffstat (limited to 'Mailman/Handlers/ToDigest.py')
| -rw-r--r-- | Mailman/Handlers/ToDigest.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Mailman/Handlers/ToDigest.py b/Mailman/Handlers/ToDigest.py index 046cbaba..15042075 100644 --- a/Mailman/Handlers/ToDigest.py +++ b/Mailman/Handlers/ToDigest.py @@ -72,10 +72,9 @@ 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') + return text.encode(ocset, 'replace') else: - return text.decode(lcset, errors='replace').encode(ocset, - errors='replace') + return text.decode(lcset, 'replace').encode(ocset, 'replace') |