Update of /cvsroot/mailman/mailman/Mailman/Handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv18797/Mailman/Handlers
Modified Files:
Tag: Release_2_1-maint
Scrubber.py
Log Message:
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.
Index: Scrubber.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Scrubber.py,v
retrieving revision 2.18.2.5
retrieving revision 2.18.2.6
diff -u -d -r2.18.2.5 -r2.18.2.6
--- Scrubber.py 1 Dec 2003 01:41:05 -0000 2.18.2.5
+++ Scrubber.py 1 Dec 2003 01:43:18 -0000 2.18.2.6
@@ -308,7 +308,7 @@
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.
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
