Ignore case comparing charsets.

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 1e6852ceadce0158f2468846045f04204101d0c0..f819b84c62e3decd62374b021e7b3b41f80946be 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -64,7 +64,7 @@ def recode(s, charset):
 
 
 def recode2(s, charset):
-   if charset and charset <> GlobalOptions.default_charset:
+   if charset and charset.lower() <> GlobalOptions.default_charset:
       s = recode(s, charset)
    return s
 
@@ -198,7 +198,7 @@ def recode_charset(msg, s):
    "Recode charset of the message to the default charset"
 
    save_charset = charset = msg.get_content_charset()
-   if charset and charset <> GlobalOptions.default_charset:
+   if charset and charset.lower() <> GlobalOptions.default_charset:
       s = recode2(s, charset)
       content_type = msg.get_content_type()
       set_content_type(msg, content_type, GlobalOptions.default_charset)
@@ -316,6 +316,8 @@ class GlobalOptions:
    else:
       default_charset = sys.getdefaultencoding()
 
+   default_charset = default_charset.lower()
+
    recode_charset = 1 # recode charset of message body
 
    decode_headers = ["Subject", "From"] # A list of headers to decode