aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-07-30 11:26:18 -0400
committerGitHub <noreply@github.com>2016-07-30 11:26:18 -0400
commit12984fb9969d67cdd1ca88ffe2331c12a84be609 (patch)
tree8e46cbb09db86e80c03f94663b795aab9c8cca39
parent09234d3084739075e0aba59002419c341a59a47e (diff)
parentba535ea4958e17a2cb2e79df093f50d057c07562 (diff)
downloadexternal_python_setuptools-12984fb9969d67cdd1ca88ffe2331c12a84be609.tar.gz
external_python_setuptools-12984fb9969d67cdd1ca88ffe2331c12a84be609.tar.bz2
external_python_setuptools-12984fb9969d67cdd1ca88ffe2331c12a84be609.zip
Merge pull request #700 from JGoutin/patch-1
Fix for #646 : Wrong error caught in RegistryInfo.lookup
-rw-r--r--setuptools/msvc.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index c762c28f..6fb3300b 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -449,10 +449,14 @@ class RegistryInfo:
for hkey in self.HKEYS:
try:
bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
+ except OSError:
+ continue
except IOError:
continue
try:
return winreg.QueryValueEx(bkey, name)[0]
+ except OSError:
+ pass
except IOError:
pass