From d574f234fda1e19e778eaeda95170fbaa98fa1fc Mon Sep 17 00:00:00 2001
From: tkikuchi <>
Date: Sat, 13 Nov 2004 04:39:33 +0000
Subject: Normalize charset to the output if input/output are different.

---
 Mailman/Handlers/Scrubber.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py
index 6116806b..070c307d 100644
--- a/Mailman/Handlers/Scrubber.py
+++ b/Mailman/Handlers/Scrubber.py
@@ -315,6 +315,9 @@ Url : %(url)s
         # 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
-- 
cgit v1.2.3