def usage(code=0, errormsg=''):
version(0)
sys.stdout.write("""\
-Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header] [-p header:param] [-beit mask] [-o output_file] [input_file [output_file]]
+Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header1[,header2,header3...]] [-p header:param] [-r header] [-R header:param] [--remove-params=header] [-beit mask] [-o output_file] [input_file [output_file]]
""" % me)
if errormsg:
sys.stderr.write(errormsg + '\n')
"""Return a decoded string according to RFC 2047.
NOTE: This is almost the same as email.Utils.decode.
"""
- from types import ListType
import email.Header
L = email.Header.decode_header(s)
- if not isinstance(L, ListType):
+ if not isinstance(L, list):
# s wasn't decoded
return s
if msg.has_key(header):
value = msg.get_param(param, header=header)
if value:
- from types import TupleType
- if isinstance(value, TupleType):
+ if isinstance(value, tuple):
new_value = _decode_header_param(value)
else:
new_value = _decode_header(value)
def decode_headers(msg):
"Decode message headers according to global options"
- for header in gopts.decode_headers:
- decode_header(msg, header)
+ for header in gopts.remove_headers:
+ del msg[header]
+
+ for header in gopts.remove_all_params:
+ value = msg[header]
+ if value is None: # No such header
+ continue
+ if ';' not in value: # There are no parameters
+ continue
+ del msg[header] # Delete all such headers
+ # Get the value without parameters and set it back
+ msg[header] = value.split(';')[0].strip()
+
+ for header, param in gopts.remove_header_params:
+ msg.del_param(param, header)
+
+ for header_list in gopts.decode_headers:
+ for header in header_list.split(','):
+ decode_header(msg, header)
for header, param in gopts.decode_header_params:
decode_header_param(msg, header, param)
host_name = None
- decode_headers = ["From", "To", "Subject"] # A list of headers to decode
+ # A list of headers to decode
+ decode_headers = ["From", "To", "Cc", "Reply-To", "Mail-Followup-To",
+ "Subject"]
+
+ # A list of headers parameters to decode
decode_header_params = [
("Content-Type", "name"),
("Content-Disposition", "filename"),
- ] # A list of headers' parameters to decode
+ ]
+
+ # A list of headers to remove
+ remove_headers = []
+ # A list of headers parameters to remove
+ remove_header_params = []
+ # A list of headers to be stripped of all parameters
+ remove_all_params = []
totext_mask = [] # A list of content-types to decode
binary_mask = [] # A list to pass through
from getopt import getopt, GetoptError
try:
- options, arguments = getopt(sys.argv[1:], 'hVcCDPH:f:d:p:b:e:i:t:o:',
- ['help', 'version', 'host'])
+ options, arguments = getopt(sys.argv[1:],
+ 'hVcCDPH:f:d:p:r:R:b:e:i:t:o:',
+ ['help', 'version', 'host=', 'remove-params='])
except GetoptError:
usage(1)
gopts.decode_header_params.append(value.split(':', 1))
elif option == '-P':
gopts.decode_header_params = []
+ elif option == '-r':
+ gopts.remove_headers.append(value)
+ elif option == '-R':
+ gopts.remove_header_params.append(value.split(':', 1))
+ elif option == '--remove-params':
+ gopts.remove_all_params.append(value)
elif option == '-t':
gopts.totext_mask.append(value)
elif option == '-b':