Close infile and outfile even after an exception

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 0e15fe015d3bcaaaed707cd50e8f7fb5ae6ae81c..692a0f0d700706799203af81c59a00b9e8df5ef6 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -30,9 +30,6 @@ Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [
     sys.exit(code)
 
 
-def output(s):
-    gopts.outfile.write(s)
-
 def output_headers(msg):
     unix_from = msg.get_unixfrom()
     if unix_from:
@@ -45,8 +42,7 @@ def output_headers(msg):
 def recode(s, charset):
     return unicode(s, charset, "replace").encode(gopts.default_encoding, "replace")
 
-
-def recode2(s, charset):
+def recode_if_needed(s, charset):
     if charset and charset.lower() <> gopts.default_encoding:
         s = recode(s, charset)
     return s
@@ -69,7 +65,7 @@ def _decode_header(s):
         if charset is None:
             rtn.append(atom)
         else:
-            rtn.append(recode2(atom, charset))
+            rtn.append(recode_if_needed(atom, charset))
         rtn.append(' ')
     del rtn[-1] # remove the last space
 
@@ -77,7 +73,6 @@ def _decode_header(s):
     # together into the final string.
     return ''.join(rtn)
 
-
 def decode_header(msg, header):
     "Decode mail header (if exists) and put it back, if it was encoded"
 
@@ -89,8 +84,7 @@ def decode_header(msg, header):
 
 
 def _decode_header_param(s):
-    return recode2(s[2], s[0])
-
+    return recode_if_needed(s[2], s[0])
 
 def decode_header_param(msg, header, param):
     "Decode mail header's parameter (if exists) and put it back, if it was encoded"
@@ -133,7 +127,6 @@ def set_content_type(msg, newtype, charset=None):
         msg.set_param("charset", charset, "Content-Type")
 
 
-
 caps = None # Globally stored mailcap database; initialized only if needed
 
 def decode_body(msg, s):
@@ -182,7 +175,7 @@ def recode_charset(msg, s):
 
     save_charset = charset = msg.get_content_charset()
     if charset and charset.lower() <> gopts.default_encoding:
-        s = recode2(s, charset)
+        s = recode_if_needed(s, charset)
         content_type = msg.get_content_type()
         set_content_type(msg, content_type, gopts.default_encoding)
         msg["X-MIME-Autoconverted"] = "from %s to %s by %s id %s" % (save_charset, gopts.default_encoding, gopts.host_name, me)
@@ -193,7 +186,7 @@ def totext(msg, instring):
     "Convert instring content to text"
 
     if msg.is_multipart(): # Recursively decode all parts of the multipart message
-        newfile = StringIO(str(msg))
+        newfile = StringIO(msg.as_string())
         newfile.seek(0)
         decode_file(newfile)
         return
@@ -276,7 +269,7 @@ def decode_file(infile):
             decode_part(msg)
 
         else: # Not a message, just text - copy it literally
-            output(str(msg))
+            output(msg.as_string())
 
 
 class GlobalOptions:
@@ -354,9 +347,12 @@ if __name__ == "__main__":
     la = len(arguments)
     if la == 0:
         gopts.input_filename = '-'
-        gopts.output_filename = '-'
         infile = sys.stdin
-        outfile = sys.stdout
+        if gopts.output_filename:
+            outfile = open(gopts.output_filename, 'w')
+        else:
+            gopts.output_filename = '-'
+            outfile = sys.stdout
     elif la in (1, 2):
         if (arguments[0] == '-'):
             gopts.input_filename = '-'
@@ -382,16 +378,20 @@ if __name__ == "__main__":
     else:
         usage(1, 'Too many arguments')
 
-    if (infile is sys.stdin) and (outfile is sys.stdout) and \
-            sys.stdin.isatty() and sys.stdout.isatty():
-        usage(1, 'Filtering from console to console is forbidden')
+    if (infile is sys.stdin) and sys.stdin.isatty():
+        if (outfile is sys.stdout) and sys.stdout.isatty():
+            usage()
+        usage(1, 'Filtering from console is forbidden')
 
     if not gopts.host_name:
         import socket
         gopts.host_name = socket.gethostname()
 
     gopts.outfile = outfile
-    decode_file(infile)
+    output = outfile.write
 
-    infile.close()
-    outfile.close()
+    try:
+        decode_file(infile)
+    finally:
+        infile.close()
+        outfile.close()