"""Decode MIME message"""
import sys, os
+import subprocess
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])
for key, value in msg.items():
output(key)
output(": ")
- output(value)
+ value = value.split(';', 1)
+ output(value[0])
+ if len(value) == 2:
+ output(";")
+ output(_decode_header(value[1], strip=False))
output(os.linesep)
output(os.linesep) # End of headers
caps = mailcap.getcaps()
content_type = msg.get_content_type()
+ if content_type.startswith('text/'):
+ charset = msg.get_content_charset()
+ else:
+ charset = None
filename = tempfile.mktemp()
command = None
return s
outfile = open(filename, 'wb')
+ 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")
outfile.write(s)
outfile.close()
- pipe = os.popen(command, 'r')
- s = pipe.read()
- pipe.close()
+ 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
+ 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)
- 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])
-
return s
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
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=',