Version 2.1.3: minor bugfix

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 1e6852ceadce0158f2468846045f04204101d0c0..56d59ca415276f3122a196fd6d390b3655a7c4b3 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -1,25 +1,16 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 """Decode MIME message"""
 
 
-_version = "2.1.0"
-__version__ = "$Revision$"[11:-2]
-__date__ = "$Date$"[7:-2]
-__revision__ = "$Id$"[5:-2]
-__author__ = "Oleg Broytmann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2001-2006 PhiloSoft Design"
+__version__ = "2.1.3"
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2001-2013 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
 import sys, os
 import email
 
-try:
-   import locale
-   use_locale = True
-except ImportError:
-   use_locale = False
-
 try:
    from cStringIO import StringIO
 except ImportError:
@@ -34,8 +25,8 @@ me = os.path.basename(sys.argv[0])
 
 def version(exit=1):
    sys.stdout.write("""\
-BroytMann mimedecode.py version %s, %s
-""" % (_version, __copyright__))
+Broytman mimedecode.py version %s, %s
+""" % (__version__, __copyright__))
    if exit: sys.exit(0)
 
 
@@ -60,11 +51,11 @@ def output_headers(msg, outfile = sys.stdout):
 
 
 def recode(s, charset):
-   return unicode(s, charset, "replace").encode(GlobalOptions.default_charset, "replace")
+   return unicode(s, charset, "replace").encode(GlobalOptions.default_encoding, "replace")
 
 
 def recode2(s, charset):
-   if charset and charset <> GlobalOptions.default_charset:
+   if charset and charset.lower() <> GlobalOptions.default_encoding:
       s = recode(s, charset)
    return s
 
@@ -198,11 +189,11 @@ 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_encoding:
       s = recode2(s, charset)
       content_type = msg.get_content_type()
-      set_content_type(msg, content_type, GlobalOptions.default_charset)
-      msg["X-MIME-Autoconverted"] = "from %s to %s by %s id %s" % (save_charset, GlobalOptions.default_charset, host_name, me)
+      set_content_type(msg, content_type, GlobalOptions.default_encoding)
+      msg["X-MIME-Autoconverted"] = "from %s to %s by %s id %s" % (save_charset, GlobalOptions.default_encoding, host_name, me)
    return s
 
 
@@ -297,25 +288,7 @@ def decode_file(infile):
 
 
 class GlobalOptions:
-   if use_locale:
-      # Get the 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:
-         try:
-            default_charset = locale.getpreferredencoding()
-         except locale.Error, err:
-            print >> sys.stderr, "WARNING:", err
-            default_charset = sys.getdefaultencoding()
-   else:
-      default_charset = sys.getdefaultencoding()
-
+   from m_lib.defenc import default_encoding
    recode_charset = 1 # recode charset of message body
 
    decode_headers = ["Subject", "From"] # A list of headers to decode
@@ -352,7 +325,7 @@ def init():
       elif option == '-C':
          GlobalOptions.recode_charset = 0
       elif option == '-f':
-         GlobalOptions.default_charset = value
+         GlobalOptions.default_encoding = value
       elif option == '-d':
          GlobalOptions.decode_headers.append(value)
       elif option == '-D':