diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-07-03 05:18:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-03 05:18:23 -0400 |
| commit | 213baae85f0b9c2640fdf7bf270f6b210f119c54 (patch) | |
| tree | fb743ec8d5b76f6bec0d3b0660887c03e43e974d /setuptools/msvc.py | |
| parent | 78928efa890109410b315b03a225c9fc5f041ff8 (diff) | |
| parent | ca0065fb62c1728cb42b86ae79375533856d2248 (diff) | |
| download | external_python_setuptools-213baae85f0b9c2640fdf7bf270f6b210f119c54.tar.gz external_python_setuptools-213baae85f0b9c2640fdf7bf270f6b210f119c54.tar.bz2 external_python_setuptools-213baae85f0b9c2640fdf7bf270f6b210f119c54.zip | |
Merge pull request #2143 from pypa/distutils
Adopt distutils
Diffstat (limited to 'setuptools/msvc.py')
| -rw-r--r-- | setuptools/msvc.py | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 213e39c9..09f8565e 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -643,8 +643,10 @@ class RegistryInfo: """ key_read = winreg.KEY_READ openkey = winreg.OpenKey + closekey = winreg.CloseKey ms = self.microsoft for hkey in self.HKEYS: + bkey = None try: bkey = openkey(hkey, ms(key), 0, key_read) except (OSError, IOError): @@ -659,6 +661,9 @@ class RegistryInfo: return winreg.QueryValueEx(bkey, name)[0] except (OSError, IOError): pass + finally: + if bkey: + closekey(bkey) class SystemInfo: @@ -726,21 +731,22 @@ class SystemInfo: bkey = winreg.OpenKey(hkey, ms(key), 0, winreg.KEY_READ) except (OSError, IOError): continue - subkeys, values, _ = winreg.QueryInfoKey(bkey) - for i in range(values): - try: - ver = float(winreg.EnumValue(bkey, i)[0]) - if ver not in vs_vers: - vs_vers.append(ver) - except ValueError: - pass - for i in range(subkeys): - try: - ver = float(winreg.EnumKey(bkey, i)) - if ver not in vs_vers: - vs_vers.append(ver) - except ValueError: - pass + with bkey: + subkeys, values, _ = winreg.QueryInfoKey(bkey) + for i in range(values): + try: + ver = float(winreg.EnumValue(bkey, i)[0]) + if ver not in vs_vers: + vs_vers.append(ver) + except ValueError: + pass + for i in range(subkeys): + try: + ver = float(winreg.EnumKey(bkey, i)) + if ver not in vs_vers: + vs_vers.append(ver) + except ValueError: + pass return sorted(vs_vers) def find_programdata_vs_vers(self): |