X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=cd972210a1dc46d35dd55a3e2a1bb1cd11811863;hb=c1a5169774327b8f530ed41ff061748e8b10923b;hp=9433b0d0caad0411bca110c7024f9f5f30a0a65e;hpb=bf2931c9491ed9d9155dbd97feb48ac5fb0bde49;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index 9433b0d..cd97221 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -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