From 5e0a0832c3c713d57cdc01b91b9e6a1c4ccc15f3 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 27 Aug 2017 20:04:33 +0300 Subject: [PATCH] Fix: Recode text from mailcap command from default encoding to charset --- mimedecode.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mimedecode.py b/mimedecode.py index 9433b0d..5459cbf 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 -- 2.39.5