diff options
| -rw-r--r-- | Mailman/Handlers/CookHeaders.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py index 1b65aa2eb..40eddd663 100644 --- a/Mailman/Handlers/CookHeaders.py +++ b/Mailman/Handlers/CookHeaders.py @@ -244,6 +244,11 @@ def prefix_subject(mlist, msg, msgdata): c = Charset(c) if not _isunicode(s): codec = c.input_codec or 'ascii' - s = unicode(s, codec, 'replace') + try: + s = unicode(s, codec, 'replace') + except LookupError: + # Unknown codec, is this default reasonable? + s = unicode(s, Utils.GetCharSet(mlist.preferred_language), + 'replace') h.append(s, c) msg['Subject'] = h |