diff options
| -rw-r--r-- | src/mailman/docs/NEWS.rst | 2 | ||||
| -rw-r--r-- | src/mailman/rules/approved.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst index f4407e62e..ed5b09ab8 100644 --- a/src/mailman/docs/NEWS.rst +++ b/src/mailman/docs/NEWS.rst @@ -69,6 +69,8 @@ Bugs which is already subscribed with that role produces a server error. Originally given by Anirudh Dahiya. (Closes #198) * Cross-posting messages held on both lists no longer fails. (Closes #176) + * Don't let unknown charsets crash the "approved" rule. Given by Aurélien + Bompard. (Closes #203) Configuration ------------- diff --git a/src/mailman/rules/approved.py b/src/mailman/rules/approved.py index 2671be151..3d16b44f9 100644 --- a/src/mailman/rules/approved.py +++ b/src/mailman/rules/approved.py @@ -77,7 +77,7 @@ class Approved: charset = part.get_content_charset('us-ascii') try: # Do the decoding inside the try/except so that if the - # charset conversion fails, we'll just drop back to ascii. + # charset is unknown, we'll just drop back to ascii. payload = payload.decode(charset, 'replace') except LookupError: # Unknown or empty charset. |