diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-11-06 02:58:56 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-11-06 02:58:56 (GMT) |
| commit | c6d7ead095fdd3b1ee82a338d4ffd88b2c2c2fce (patch) | |
| tree | 87bd3d5006d1f4050f64a44c59910461747f08dc /Lib/distutils/cygwinccompiler.py | |
| parent | 997980fe13ae7952665da56b122aeff9ea8fa6df (diff) | |
| download | cpython-c6d7ead095fdd3b1ee82a338d4ffd88b2c2c2fce.zip cpython-c6d7ead095fdd3b1ee82a338d4ffd88b2c2c2fce.tar.gz cpython-c6d7ead095fdd3b1ee82a338d4ffd88b2c2c2fce.tar.bz2 | |
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/cygwinccompiler.py')
| -rw-r--r-- | Lib/distutils/cygwinccompiler.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py index 8504371..95fa3ed 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -350,11 +350,14 @@ def check_config_h(): # let's see if __GNUC__ is mentioned in python.h fn = sysconfig.get_config_h_filename() try: - with open(fn) as config_h: + config_h = open(fn) + try: if "__GNUC__" in config_h.read(): return CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn else: return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn + finally: + config_h.close() except IOError as exc: return (CONFIG_H_UNCERTAIN, "couldn't read '%s': %s" % (fn, exc.strerror)) |