"""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.remove_headers:
+ del msg[header]
+
+ for header, param in gopts.remove_header_params:
+ msg.del_param(param, header)
+
for header in gopts.decode_headers:
decode_header(msg, header)
if msg.is_multipart():
decode_multipart(msg)
- elif msg.has_key("Content-Type"): # Simple one-part message - decode it
+ elif len(msg): # Simple one-part message (there are headers) - decode it
decode_part(msg)
else: # Not a message, just text - copy it literally
output(msg.as_string())
host_name = None
- decode_headers = ["From", "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 = []
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:',
+ options, arguments = getopt(sys.argv[1:],
+ 'hVcCDPH:f:d:p:r:R:b:e:i:t:o:',
['help', 'version', 'host'])
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 == '-t':
gopts.totext_mask.append(value)
elif option == '-b':