X-Git-Url: https://git.phdru.name/?p=mimedecode.git;a=blobdiff_plain;f=mimedecode.py;h=5459cbff73ab05dcc32ba5f7645ae5951a525cb8;hp=5f3321c22fa73529108230a79516436cfa78e1cc;hb=5e0a0832c3c713d57cdc01b91b9e6a1c4ccc15f3;hpb=9f247f1c7dd35d334713714209a76c27e990621d

diff --git a/mimedecode.py b/mimedecode.py
index 5f3321c..5459cbf 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -2,8 +2,13 @@
 """Decode MIME message"""
 
 import sys, os
+import subprocess
 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,24 +244,27 @@ 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")
     outfile.write(s)
     outfile.close()
 
-    pipe = os.popen(command, 'r')
-    new_s = pipe.read()
-    if pipe.close() is None: # result=0, Ok
+    pipe = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
+    new_s = pipe.stdout.read()
+    pipe.stdout.close()
+    if pipe.wait() == 0: # result=0, Ok
         s = new_s
-    os.remove(filename)
-
-    set_content_type(msg, "text/plain")
-    if s is new_s:
+        if bytes is not str and isinstance(s, bytes):  # Python3
+            s = s.decode(g.default_encoding, "replace")
+        if charset and not isinstance(s, bytes):
+            s = s.encode(charset, "replace")
+        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])
     else:
         msg["X-MIME-Autoconverted"] = "failed conversion from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
+    os.remove(filename)
 
     return s