X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=882034b0f4f021d91277dd9e21676114caf144aa;hb=5a0b966d01b89f668ce0cea40208d511e1bc04f7;hp=4776126474cbd4e00b036cdfd368f89d46219108;hpb=d6315799230ac62abddd0604498e93600578f7ec;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index 4776126..882034b 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -47,11 +47,10 @@ def _decode_header(s):
     """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
 
@@ -87,8 +86,7 @@ def decode_header_param(msg, header, param):
     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)
@@ -99,6 +97,12 @@ def decode_header_param(msg, header, param):
 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)
 
@@ -273,11 +277,20 @@ class GlobalOptions:
 
     host_name = None
 
-    decode_headers = ["From", "To", "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
@@ -294,7 +307,8 @@ def get_opt():
     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)
@@ -320,6 +334,10 @@ def get_opt():
             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':