Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. (Need to forward-port this.)

akuchling · akuchling · commit 8cca0b7db27e · 2006-11-19T19:00:04.000Z
diff --git a/Lib/uu.py b/Lib/uu.py
@@ -115,6 +115,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):
     #
     # Open the output file
     #
+    opened = False
     if out_file == '-':
         out_file = sys.stdout
     elif isinstance(out_file, StringType):
@@ -124,6 +125,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):
         except AttributeError:
             pass
         out_file = fp
+        opened = True
     #
     # Main decoding loop
     #
@@ -141,6 +143,8 @@ def decode(in_file, out_file=None, mode=None, quiet=0):
         s = in_file.readline()
     if not s:
         raise Error, 'Truncated input file'
+    if opened:
+        out_file.close()
 
 def test():
     """uuencode/uudecode main program"""

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):`
`115`	`115`	`#`
`116`	`116`	`# Open the output file`
`117`	`117`	`#`
	`118`	`+ opened = False`
`118`	`119`	`if out_file == '-':`
`119`	`120`	`out_file = sys.stdout`
`120`	`121`	`elif isinstance(out_file, StringType):`
`@@ -124,6 +125,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):`
`124`	`125`	`except AttributeError:`
`125`	`126`	`pass`
`126`	`127`	`out_file = fp`
	`128`	`+ opened = True`
`127`	`129`	`#`
`128`	`130`	`# Main decoding loop`
`129`	`131`	`#`
`@@ -141,6 +143,8 @@ def decode(in_file, out_file=None, mode=None, quiet=0):`
`141`	`143`	`s = in_file.readline()`
`142`	`144`	`if not s:`
`143`	`145`	`raise Error, 'Truncated input file'`
	`146`	`+ if opened:`
	`147`	`+ out_file.close()`
`144`	`148`
`145`	`149`	`def test():`
`146`	`150`	`"""uuencode/uudecode main program"""`