diff options
author | Éric Araujo <merwok@netwok.org> | 2010-11-06 04:06:18 +0000 |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2010-11-06 04:06:18 +0000 |
commit | d1feff70a3c08f91066b99a74ee1ca8f65bdfec1 (patch) | |
tree | 27144df6cefbb43ab305d380a584a81d7fb0b248 /Lib/distutils/file_util.py | |
parent | 860c05d9f7fe7da7e9633c7aa24a9dbc07b048b7 (diff) | |
download | cpython-git-d1feff70a3c08f91066b99a74ee1ca8f65bdfec1.tar.gz |
Merged revisions 86223-86224,86226,86234 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86223 | eric.araujo | 2010-11-06 00:51:56 +0100 (sam., 06 nov. 2010) | 2 lines
Always close files in distutils code and tests (#10252).
........
r86224 | eric.araujo | 2010-11-06 00:58:34 +0100 (sam., 06 nov. 2010) | 2 lines
Add missing entry for r86223.
........
r86226 | eric.araujo | 2010-11-06 00:59:32 +0100 (sam., 06 nov. 2010) | 2 lines
Of course, I forgot one file in r86223.
........
r86234 | eric.araujo | 2010-11-06 03:10:32 +0100 (sam., 06 nov. 2010) | 2 lines
Also close file descriptors from os.popen and subprocess.Popen
........
Diffstat (limited to 'Lib/distutils/file_util.py')
-rw-r--r-- | Lib/distutils/file_util.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py index b3d9d54ec0..b9f0786133 100644 --- a/Lib/distutils/file_util.py +++ b/Lib/distutils/file_util.py @@ -224,6 +224,8 @@ def write_file (filename, contents): sequence of strings without line terminators) to it. """ f = open(filename, "w") - for line in contents: - f.write(line + "\n") - f.close() + try: + for line in contents: + f.write(line + "\n") + finally: + f.close() |