Replace phd2.chat.ru mirror with phd.webhost.ru.

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index e596f1d2e681ee4385bd1253293b2ecadd57114b..f819b84c62e3decd62374b021e7b3b41f80946be 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -1,6 +1,7 @@
 #! /usr/local/bin/python -O
 """Decode MIME message"""
 
+
 _version = "2.1.0"
 __version__ = "$Revision$"[11:-2]
 __date__ = "$Date$"[7:-2]
@@ -12,7 +13,12 @@ __license__ = "GNU GPL"
 
 import sys, os
 import email
-import locale
+
+try:
+   import locale
+   use_locale = True
+except ImportError:
+   use_locale = False
 
 try:
    from cStringIO import StringIO
@@ -58,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
 
@@ -192,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)
@@ -291,21 +297,26 @@ def decode_file(infile):
 
 
 class GlobalOptions:
-   # Get a default charset.
-   try:
-      lcAll = locale.setlocale(locale.LC_ALL, '').split('.')
-   except locale.Error, err:
-      print >> sys.stderr, "WARNING:", err
-      lcAll = []
-
-   if len(lcAll) == 2:
-      default_charset = lcAll[1]
-   else:
+   if use_locale:
+      # Get the default charset.
       try:
-         default_charset = locale.getpreferredencoding()
+         lcAll = locale.setlocale(locale.LC_ALL, '').split('.')
       except locale.Error, err:
          print >> sys.stderr, "WARNING:", err
-         default_charset = sys.getdefaultencoding()
+         lcAll = []
+
+      if len(lcAll) == 2:
+         default_charset = lcAll[1]
+      else:
+         try:
+            default_charset = locale.getpreferredencoding()
+         except locale.Error, err:
+            print >> sys.stderr, "WARNING:", err
+            default_charset = sys.getdefaultencoding()
+   else:
+      default_charset = sys.getdefaultencoding()
+
+   default_charset = default_charset.lower()
 
    recode_charset = 1 # recode charset of message body
 
@@ -369,9 +380,10 @@ def init():
 if __name__ == "__main__":
    arguments = init()
 
-   if len(arguments) == 0:
+   la = len(arguments)
+   if la == 0:
       infile = sys.stdin
-   elif len(arguments) <> 1:
+   elif la <> 1:
       usage(1)
    elif arguments[0] == '-':
       infile = sys.stdin