X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=mimedecode.py;h=36cc340c5556f2c07a088d87a78f4f4388280b3f;hb=0941d7aa690ffd64c2526f86bb36aed7daf9e6dd;hp=9433b0d0caad0411bca110c7024f9f5f30a0a65e;hpb=bf2931c9491ed9d9155dbd97feb48ac5fb0bde49;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index 9433b0d..36cc340 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -105,7 +105,7 @@ def decode_header_param(msg, header, param):
 
 
 def _get_exceptions(list):
-    return [x[1:].lower() for x in list[1:] if x[0]=='-']
+    return [x[1:].lower() for x in list[1:] if x[0] == '-']
 
 def _decode_headers_params(msg, header, decode_all_params, param_list):
     if decode_all_params:
@@ -256,13 +256,15 @@ def decode_body(msg, s):
     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
 
@@ -383,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
@@ -562,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=',