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

diff --git a/mimedecode.py b/mimedecode.py
index 5f3321c..3b1df3e 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -4,6 +4,10 @@
 import sys, os
 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,7 +243,7 @@ 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")