Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24632
Modified Files:
Tag: Release_2_1-maint
Utils.py
Log Message:
More error handling for oneline().
Index: Utils.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Utils.py,v
retrieving revision 2.45.2.7
retrieving revision 2.45.2.8
diff -u -d -r2.45.2.7 -r2.45.2.8
--- Utils.py 26 Dec 2003 22:50:04 -0000 2.45.2.7
+++ Utils.py 18 Sep 2004 06:51:47 -0000 2.45.2.8
@@ -36,6 +36,7 @@
import htmlentitydefs
import email.Header
import email.Iterators
+from email.Errors import HeaderParseError
from types import UnicodeType
from string import whitespace, digits
try:
@@ -816,6 +817,6 @@
ustr = h.__unicode__()
line = UEMPTYSTRING.join(ustr.splitlines())
return line.encode(cset, 'replace')
- except (LookupError, UnicodeError):
+ except (LookupError, UnicodeError, ValueError, HeaderParseError):
# possibly charset problem. return with undecoded string in one line.
return EMPTYSTRING.join(s.splitlines())
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
