Use list/tuple directly instead of using types module

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 90f189e4b2869e494361da9e278ba36977df4f1b..569559b19e722e11de98ece1daaec3063fe51521 100755 (executable)
--- 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)
@@ -274,7 +272,8 @@ class GlobalOptions:
     host_name = None
 
     # A list of headers to decode
-    decode_headers = ["From", "To", "Cc", "Reply-To", "Subject"]
+    decode_headers = ["From", "To", "Cc", "Reply-To", "Mail-Followup-To",
+                      "Subject"]
 
     # A list of headers' parameters to decode
     decode_header_params = [