Cleanup: Fix flake8 E128 continuation line under-indented for visual indent

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 3b1df3e233dea79d8dd4f4b4b3425b883b6b51e5..2fccbcc7b13f2cece51828769653bc2320257518 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -2,6 +2,7 @@
 """Decode MIME message"""
 
 import sys, os
+import subprocess
 from mimedecode_version import __version__, \
     __author__, __copyright__, __license__
 if sys.version_info[0] >= 3:
@@ -250,17 +251,20 @@ def decode_body(msg, s):
     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
 
@@ -381,7 +385,7 @@ def decode_part(msg):
             outstring = totext(msg, outstring)
             break
         elif content_type in g.binary_mask or \
-             content_type in g.decoded_binary_mask:
+                content_type in g.decoded_binary_mask:
             output_headers(msg)
             output(outstring)
             break
@@ -560,7 +564,8 @@ def get_opts():
     from getopt import getopt, GetoptError
 
     try:
-        options, arguments = getopt(sys.argv[1:],
+        options, arguments = getopt(
+            sys.argv[1:],
             'hVcCDPH:f:d:p:r:R:b:B:e:I:i:t:O:o:',
             ['help', 'version', 'host=',
              'save-headers=', 'save-body=', 'save-message=',