diff options
| author | Mark Sapiro <mark@msapiro.net> | 2015-06-07 22:41:05 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2015-06-07 22:41:05 -0700 |
| commit | 025094bf9692e3f2ae58321bb753425a01046163 (patch) | |
| tree | 7ca5a845ac6bc55f00e00621d418301aaf4e2a04 /Mailman/Handlers | |
| parent | 55dbcac0d2f3d7478c4e4fb7be4848023ee2cbb3 (diff) | |
| download | mailman2-025094bf9692e3f2ae58321bb753425a01046163.tar.gz mailman2-025094bf9692e3f2ae58321bb753425a01046163.tar.xz mailman2-025094bf9692e3f2ae58321bb753425a01046163.zip | |
Fixed an issue with shunted messages on a list where the charset for
the list's preferred_language had been changed from iso-8859-1 to
utf-8 without recoding the list's description.
Diffstat (limited to 'Mailman/Handlers')
| -rwxr-xr-x | 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 236f39f1..25fda890 100755 --- a/Mailman/Handlers/CookHeaders.py +++ b/Mailman/Handlers/CookHeaders.py @@ -65,7 +65,12 @@ def uheader(mlist, s, header_name=None, continuation_ws='\t', maxlinelen=None): else: # there is no nonascii so ... charset = 'us-ascii' - return Header(s, charset, maxlinelen, header_name, continuation_ws) + try: + return Header(s, charset, maxlinelen, header_name, continuation_ws) + except UnicodeError: + syslog('error', 'list: %s: can\'t decode "%s" as %s', + mlist.internal_name(), s, charset) + return Header('', charset, maxlinelen, header_name, continuation_ws) def change_header(name, value, mlist, msg, msgdata, delete=True, repl=True): if ((msgdata.get('from_is_list') == 2 or |