fix hkey cleanup

rico-chet · tonyroberts · commit c9a784b619e8 · 2016-06-23T09:47:30.000+01:00
fix for AttributeError: 'NoneType' object has no attribute 'Close', full Traceback (most recent call last):
      File "&lt;string&gt;", line 1, in &lt;module&gt;
      File "C:\Users\foo\AppData\Local\Temp\pip-clrr6blj-build\setup.py", line 99, in &lt;module&gt;
        _xbuild = "\"%s\"" % _find_msbuild_tool("msbuild.exe")
      File "C:\Users\foo\AppData\Local\Temp\pip-clrr6blj-build\setup.py", line 77, in _find_msbuild_tool
        hkey.Close()
    AttributeError: 'NoneType' object has no attribute 'Close'
diff --git a/setup.py b/setup.py
@@ -64,10 +64,10 @@ def _find_msbuild_tool(tool="msbuild.exe", use_windows_sdk=False):
     paths_to_check = []
     hreg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
     try:
-        hkey = None
         for key_to_check in keys_to_check:
             sdk_name, key, value_name = key_to_check[:3]
             suffix = key_to_check[3] if len(key_to_check) > 3 else None
+            hkey = None
             try:
                 hkey = _winreg.OpenKey(hreg, key)
                 val, type_ = _winreg.QueryValueEx(hkey, value_name)
@@ -79,7 +79,8 @@ def _find_msbuild_tool(tool="msbuild.exe", use_windows_sdk=False):
             except WindowsError:
                 pass
             finally:
-                hkey.Close()
+                if hkey:
+                    hkey.Close()
     finally:
         hreg.Close()
 
