"""Decode MIME message"""
import sys, os
+import subprocess
from mimedecode_version import __version__, \
__author__, __copyright__, __license__
if sys.version_info[0] >= 3:
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:
outfile.write(s)
outfile.close()
- pipe = os.popen(command, 'r')
- new_s = pipe.read()
- if pipe.close() is None: # result=0, Ok
+ 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
- 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
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=',