Merge pull request #3809 from bdbaddog/remove_pywin32_from_Util

Remove pywin32 from SCons.Util where it was used for reading registry

Author: bdbaddog

CHANGES.txt

@@ -17,6 +17,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From William Deegan:
     - Fix yacc tool, not respecting YACC set at time of tool initialization.
     - Refactor SCons.Tool to move all common shared and loadable module linking logic to SCons.Tool.linkCommon
+    - Remove pywin32 usage from SCons.Util where it was used for accessing the registry. Python native winreg
+      library already includes this functionality.
     - Remove using pywin32 to retrieve peak memory usage on Win32 for `--debug=memory`
 
   From Michał Górny:

SCons/Util.py

@@ -648,22 +648,9 @@ def __get__(self, obj, cls):
     RegError        = winreg.error
 
 except ImportError:
-    try:
-        import win32api
-        import win32con
-        can_read_reg = 1
-        hkey_mod = win32con
-
-        RegOpenKeyEx    = win32api.RegOpenKeyEx
-        RegEnumKey      = win32api.RegEnumKey
-        RegEnumValue    = win32api.RegEnumValue
-        RegQueryValueEx = win32api.RegQueryValueEx
-        RegError        = win32api.error
-
-    except ImportError:
-        class _NoError(Exception):
-            pass
-        RegError = _NoError
+    class _NoError(Exception):
+        pass
+    RegError = _NoError
 
 
 # Make sure we have a definition of WindowsError so we can