import sys, os
import email
-try:
- from cStringIO import StringIO
-except ImportError:
- from StringIO import StringIO
-
me = os.path.basename(sys.argv[0])
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)
def totext(msg, instring):
"Convert instring content to text"
- if msg.is_multipart(): # Recursively decode all parts of the multipart message
- newfile = StringIO(msg.as_string())
- newfile.seek(0)
- decode_file(newfile)
- return
-
# Decode body and recode charset
s = decode_body(msg, instring)
if gopts.recode_charset:
totext(msg, outstring)
-def decode_file(infile):
- "Decode the entire message"
+def decode_multipart(msg):
+ "Decode multipart"
- msg = email.message_from_file(infile)
- boundary = msg.get_boundary()
+ decode_headers(msg)
+ output_headers(msg)
- if msg.is_multipart():
- 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()
- for subpart in msg.get_payload():
+ for subpart in msg.get_payload():
+ if boundary:
output("\n--%s\n" % boundary)
- decode_part(subpart)
+ # Recursively decode all parts of the subpart
+ decode_message(subpart)
+
+ 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 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())
class GlobalOptions:
gopts.outfile = outfile
output = outfile.write
- decode_file(infile)
-
- infile.close()
- outfile.close()
+ try:
+ decode_message(email.message_from_file(infile))
+ finally:
+ infile.close()
+ outfile.close()