aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Handlers/ToDigest.py5
-rw-r--r--NEWS3
2 files changed, 5 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')
diff --git a/NEWS b/NEWS
index 1541b414..6f5109ae 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - A Python 2.7 dependency introduced in the ToDigests handler in Mailman
+ 2.1.24 has been removed. (LP: #1755317)
+
- Bad values in a list's topics will no longer break everything that
might instantiate the list. (LP: #1754516)