Jython compatibility fix: if uu.decode() opened its output file, be sure to

andrew.kuchling · andrew.kuchling · commit a9361cb106a6 · 2006-11-20T13:39:37.000Z
close it. git-svn-id: http://svn.python.org/projects/python/trunk@52800 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/uu.py b/Lib/uu.py
@@ -114,6 +114,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, basestring):
@@ -123,6 +124,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):
         except AttributeError:
             pass
         out_file = fp
+        opened = True
     #
     # Main decoding loop
     #
@@ -140,6 +142,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
`@@ -114,6 +114,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):`
`114`	`114`	`#`
`115`	`115`	`# Open the output file`
`116`	`116`	`#`
	`117`	`+ opened = False`
`117`	`118`	`if out_file == '-':`
`118`	`119`	`out_file = sys.stdout`
`119`	`120`	`elif isinstance(out_file, basestring):`
`@@ -123,6 +124,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):`
`123`	`124`	`except AttributeError:`
`124`	`125`	`pass`
`125`	`126`	`out_file = fp`
	`127`	`+ opened = True`
`126`	`128`	`#`
`127`	`129`	`# Main decoding loop`
`128`	`130`	`#`
`@@ -140,6 +142,8 @@ def decode(in_file, out_file=None, mode=None, quiet=0):`
`140`	`142`	`s = in_file.readline()`
`141`	`143`	`if not s:`
`142`	`144`	`raise Error('Truncated input file')`
	`145`	`+ if opened:`
	`146`	`+ out_file.close()`
`143`	`147`
`144`	`148`	`def test():`
`145`	`149`	`"""uuencode/uudecode main program"""`