True/False where appropriate.

process(): When we encode the text, catch ValueError along with UnicodeError
and LookupError.  The ValueError can be raised if the charset is the empty
string.  Closes SF bug # 834486.

1 files changed, 1 insertions, 1 deletions

diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py
index 6a2f59ee..eccdc6e2 100644
--- a/Mailman/Handlers/Scrubber.py
+++ b/Mailman/Handlers/Scrubber.py
@@ -308,7 +308,7 @@ Url : %(url)s
             if partcharset and partcharset <> charset:
                 try:
                     t = unicode(t, partcharset, 'replace')
-                except (UnicodeError, LookupError):
+                except (UnicodeError, LookupError, ValueError):
                     # Replace funny characters.  We use errors='replace' for
                     # both calls since the first replace will leave U+FFFD,
                     # which isn't ASCII encodeable.