diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-11-06 02:58:56 +0000 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-11-06 02:58:56 +0000 |
| commit | c6d7ead095fdd3b1ee82a338d4ffd88b2c2c2fce (patch) | |
| tree | 87bd3d5006d1f4050f64a44c59910461747f08dc /Lib/distutils/util.py | |
| parent | 997980fe13ae7952665da56b122aeff9ea8fa6df (diff) | |
| download | cpython-git-c6d7ead095fdd3b1ee82a338d4ffd88b2c2c2fce.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/util.py')
| -rw-r--r-- | Lib/distutils/util.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 8175434586..3081245b62 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -115,13 +115,15 @@ def get_platform (): # behaviour. pass else: - m = re.search( - r'<key>ProductUserVisibleVersion</key>\s*' + - r'<string>(.*?)</string>', f.read()) - f.close() - if m is not None: - macrelease = '.'.join(m.group(1).split('.')[:2]) - # else: fall back to the default behaviour + try: + m = re.search( + r'<key>ProductUserVisibleVersion</key>\s*' + + r'<string>(.*?)</string>', f.read()) + if m is not None: + macrelease = '.'.join(m.group(1).split('.')[:2]) + # else: fall back to the default behaviour + finally: + f.close() if not macver: macver = macrelease |