Decode "To" header by default

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index d3d23ff2595418c7cc68557d63d822802caf865e..b57bd956557624acb899fc786ddfbbb72b7f24cf 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -90,9 +90,11 @@ 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)
-            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)
 
 
@@ -234,34 +236,34 @@ def decode_part(msg):
 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())
@@ -273,7 +275,7 @@ class GlobalOptions:
 
     host_name = None
 
-    decode_headers = ["From", "Subject"] # A list of headers to decode
+    decode_headers = ["From", "To", "Subject"] # A list of headers to decode
     decode_header_params = [
         ("Content-Type", "name"),
         ("Content-Disposition", "filename"),