A patch by Bogdan Maryniuk <bogdan.maryniuk@gmail.com>:

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index c0a9ef3ac76371defeff55e2f53d4c3ab047c3c7..e596f1d2e681ee4385bd1253293b2ecadd57114b 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -1,17 +1,18 @@
 #! /usr/local/bin/python -O
-"""Decode MIME message.
+"""Decode MIME message"""
 
-Author: Oleg Broytmann <phd@phd.pp.ru>
-Copyright: (C) 2001-2002 PhiloSoft Design
-License: GPL
-"""
-
-__version__ = "2.0.0"
-__copyright__ = "Copyright (C) 2001-2002 PhiloSoft Design"
+_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"
+__license__ = "GNU GPL"
 
 
 import sys, os
 import email
+import locale
 
 try:
    from cStringIO import StringIO
@@ -28,7 +29,7 @@ me = os.path.basename(sys.argv[0])
 def version(exit=1):
    sys.stdout.write("""\
 BroytMann mimedecode.py version %s, %s
-""" % (__version__, __copyright__))
+""" % (_version, __copyright__))
    if exit: sys.exit(0)
 
 
@@ -290,7 +291,22 @@ def decode_file(infile):
 
 
 class GlobalOptions:
-   default_charset = sys.getdefaultencoding()
+   # 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:
+      try:
+         default_charset = locale.getpreferredencoding()
+      except locale.Error, err:
+         print >> sys.stderr, "WARNING:", err
+         default_charset = sys.getdefaultencoding()
+
    recode_charset = 1 # recode charset of message body
 
    decode_headers = ["Subject", "From"] # A list of headers to decode