def decode_multipart(msg):
"Decode multipart"
- if msg.is_multipart():
- decode_headers(msg)
- output_headers(msg)
+ decode_headers(msg)
+ output_headers(msg)
- if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
- output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
+ if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
+ output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
- boundary = msg.get_boundary()
+ boundary = msg.get_boundary()
- for subpart in msg.get_payload():
- if boundary:
- output("\n--%s\n" % boundary)
+ for subpart in msg.get_payload():
+ if boundary:
+ output("\n--%s\n" % boundary)
- # Recursively decode all parts of the subpart
- decode_message(subpart)
+ # Recursively decode all parts of the subpart
+ decode_message(subpart)
- if boundary:
- output("\n--%s--\n" % boundary)
+ if boundary:
+ output("\n--%s--\n" % boundary)
+
+ if msg.epilogue:
+ output(msg.epilogue)
- if msg.epilogue:
- output(msg.epilogue)
def decode_message(msg):
"Decode message"
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", "Subject"]
+
+ # A list of headers' parameters to decode
decode_header_params = [
("Content-Type", "name"),
("Content-Disposition", "filename"),
- ] # A list of headers' parameters to decode
+ ]
totext_mask = [] # A list of content-types to decode
binary_mask = [] # A list to pass through