from types import TupleType
if isinstance(value, TupleType):
new_value = _decode_header_param(value)
+ changed = new_value <> value[2]
else:
new_value = _decode_header(value)
- if new_value <> value: # do not bother to touch msg if not changed
+ changed = new_value <> value
+ if changed: # do not bother to touch msg if not changed
msg.set_param(param, new_value, header)
totext(msg, outstring)
-def decode_message(msg):
- "Decode message"
+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)
- if subpart.is_multipart(): # Recursively decode all parts of the subpart
- decode_message(subpart)
- else:
- decode_part(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)
- else:
- if msg.has_key("Content-Type"): # Simple one-part message - decode it
- decode_part(msg)
- else: # Not a message, just text - copy it literally
- output(msg.as_string())
+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
+ decode_part(msg)
+ else: # Not a message, just text - copy it literally
+ output(msg.as_string())
class GlobalOptions: