Fix(Python2): Do not decode bytes to unicode

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index e7381f78cdb495bc9a1aa765ef4c2ca116098fc1..3b1df3e233dea79d8dd4f4b4b3425b883b6b51e5 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -4,6 +4,10 @@
 import sys, os
 from mimedecode_version import __version__, \
     __author__, __copyright__, __license__
+if sys.version_info[0] >= 3:
+    # Replace email.message._formatparam with _formatparam from Python 2.7
+    # to avoid re-encoding non-ascii params.
+    import formatparam_27
 
 me = os.path.basename(sys.argv[0])
 
@@ -239,7 +243,7 @@ def decode_body(msg, s):
         return s
 
     outfile = open(filename, 'wb')
-    if charset and isinstance(s, bytes):
+    if charset and bytes is not str and isinstance(s, bytes):  # Python3
         s = s.decode(charset, "replace")
     if not isinstance(s, bytes):
         s = s.encode(g.default_encoding, "replace")
@@ -247,12 +251,16 @@ def decode_body(msg, s):
     outfile.close()
 
     pipe = os.popen(command, 'r')
-    s = pipe.read()
-    pipe.close()
+    new_s = pipe.read()
+    if pipe.close() is None: # result=0, Ok
+        s = new_s
     os.remove(filename)
 
     set_content_type(msg, "text/plain")
-    msg["X-MIME-Autoconverted"] = "from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
+    if s is new_s:
+        msg["X-MIME-Autoconverted"] = "from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
+    else:
+        msg["X-MIME-Autoconverted"] = "failed conversion from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
 
     return s