X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=90f189e4b2869e494361da9e278ba36977df4f1b;hb=e523d0dbf7c78b7a66a72b8b3b13e7bf3ce3ec5b;hp=0be095beb3cc21ac8fe8d594894af1b972916281;hpb=4e678ac9522dd6372854758bcb0c3f45d37b1df3;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index 0be095b..90f189e 100755 --- a/mimedecode.py +++ b/mimedecode.py @@ -90,11 +90,9 @@ def decode_header_param(msg, header, param): 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) - changed = new_value <> value - if changed: # do not bother to touch msg if not changed + if new_value <> value: # do not bother to touch msg if not changed msg.set_param(param, new_value, header) @@ -263,7 +261,7 @@ def decode_message(msg): 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()) @@ -275,11 +273,14 @@ class GlobalOptions: 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