diff options
| author | mattip <matti.picus@gmail.com> | 2020-06-29 20:37:43 +0300 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-07-02 18:02:34 -0400 |
| commit | 9013321c25606a5cd63271cd029c2539490b16d3 (patch) | |
| tree | cfacfbcc637edbce92480becbea1ee6e651ecc6f /setuptools | |
| parent | d9998e6281cbf4bb90cfd8c90e7f34b4ea3a350d (diff) | |
| download | external_python_setuptools-9013321c25606a5cd63271cd029c2539490b16d3.tar.gz external_python_setuptools-9013321c25606a5cd63271cd029c2539490b16d3.tar.bz2 external_python_setuptools-9013321c25606a5cd63271cd029c2539490b16d3.zip | |
catch some resource leaks
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/launch.py | 3 | ||||
| -rw-r--r-- | setuptools/msvc.py | 36 |
2 files changed, 23 insertions, 16 deletions
diff --git a/setuptools/launch.py b/setuptools/launch.py index 308283ea..0208fdf3 100644 --- a/setuptools/launch.py +++ b/setuptools/launch.py @@ -25,7 +25,8 @@ def run(): sys.argv[:] = sys.argv[1:] open_ = getattr(tokenize, 'open', open) - script = open_(script_name).read() + with open_(script_name) as fid: + script = fid.read() norm_script = script.replace('\\r\\n', '\\n') code = compile(norm_script, script_name, 'exec') exec(code, namespace) 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): |