Update of /cvsroot/mailman/mailman/Mailman/Handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3313
Modified Files:
Tag: Release_2_1-maint
Scrubber.py
Log Message:
Normalize charset to the output if input/output are different.
Index: Scrubber.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Scrubber.py,v
retrieving revision 2.18.2.9
retrieving revision 2.18.2.10
diff -u -d -r2.18.2.9 -r2.18.2.10
--- Scrubber.py 14 Oct 2004 08:05:06 -0000 2.18.2.9
+++ Scrubber.py 13 Nov 2004 04:39:33 -0000 2.18.2.10
@@ -315,6 +315,9 @@
# language's charset.
if not charset or charset == 'us-ascii':
charset = lcset_out
+ else:
+ # normalize to the output charset if input/output are different
+ charset = Charset(charset).output_charset or charset
# We now want to concatenate all the parts which have been scrubbed to
# text/plain, into a single text/plain payload. We need to make sure
# all the characters in the concatenated string are in the same
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
