diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-07-03 15:11:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-03 15:11:32 -0400 |
| commit | 5f151cbbcd6c65f7f48082bfaf36db3a55df936e (patch) | |
| tree | eb721c8957ee48c5149af6742a27a449fb618027 /setuptools/msvc.py | |
| parent | a9eb9e73def8ca6c469e59f1b008746e368ad4c1 (diff) | |
| parent | a877dab0bddaeb5503d871794ca06f1c81d805b8 (diff) | |
| download | external_python_setuptools-5f151cbbcd6c65f7f48082bfaf36db3a55df936e.tar.gz external_python_setuptools-5f151cbbcd6c65f7f48082bfaf36db3a55df936e.tar.bz2 external_python_setuptools-5f151cbbcd6c65f7f48082bfaf36db3a55df936e.zip | |
Merge branch 'master' into 2020-06-11-raise-from
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 72ba0d0c..72383eb8 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): |