Merge pull request #700 from JGoutin/patch-1

Fix for #646 : Wrong error caught in RegistryInfo.lookup

Merge pull request #700 from JGoutin/patch-1
Fix for #646 : Wrong error caught in RegistryInfo.lookup
12984fb9 · Jason R. Coombs · GitHub · 09234d30 · ba535ea4 · 12984fb9
Commit 12984fb9 authored Jul 30, 2016 by Jason R. Coombs Committed by GitHub Jul 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

setuptools/msvc.py setuptools/msvc.py +4 -0

No files found.
--- 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