diff options
author | J. Goutin <JGoutin@users.noreply.github.com> | 2016-07-03 14:04:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-03 14:04:06 +0200 |
commit | 79d1fc0d9f50af9f51a3c7a7188e4afc644a4aac (patch) | |
tree | 173ce9ae0de9e835893ec05d897b9571588bf8c7 /setuptools/msvc.py | |
parent | ca2c0f9aae22081a458848e9ca6baf71f54b88e2 (diff) | |
download | external_python_setuptools-79d1fc0d9f50af9f51a3c7a7188e4afc644a4aac.tar.gz external_python_setuptools-79d1fc0d9f50af9f51a3c7a7188e4afc644a4aac.tar.bz2 external_python_setuptools-79d1fc0d9f50af9f51a3c7a7188e4afc644a4aac.zip |
msvc fixe
Fixes :
- Bad argument name
- Better Python 2 compatibility
Diffstat (limited to 'setuptools/msvc.py')
-rw-r--r-- | setuptools/msvc.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index bbf66570..a03f4fe3 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -203,7 +203,7 @@ def msvc14_get_vc_env(plat_spec): # If error, try to set environment directly try: - return EnvironmentInfo(plat_spec, vc_ver_min=14.0).return_env() + return EnvironmentInfo(plat_spec, vc_min_ver=14.0).return_env() except distutils.errors.DistutilsPlatformError as exc: _augment_exception(exc, 14.0) raise @@ -442,11 +442,11 @@ class RegistryInfo: for hkey in self.HKEYS: try: bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ) - except FileNotFoundError: + except IOError: continue try: return winreg.QueryValueEx(bkey, name)[0] - except FileNotFoundError: + except IOError: pass @@ -489,7 +489,7 @@ class SystemInfo: for key in vckeys: try: bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ) - except FileNotFoundError: + except IOError: continue subkeys, values, _ = winreg.QueryInfoKey(bkey) for i in range(values): @@ -1187,5 +1187,5 @@ class EnvironmentInfo: if name: return '%s\\' % name[0] return '' - except FileNotFoundError: + except IOError: return '' |