commit 1b5ec76190dba6c488a7617731050f7a870260ab
author Greg Ward <gward@python.net> Fri Jun 30 19:37:59 2000 +0000
committer Greg Ward <gward@python.net> Fri Jun 30 19:37:59 2000 +0000
tree c5ff8831f6d7d848ebe5d6061a6e6d0f5f302bf5
parent 2658d15d45b7ce99d36fbca2e0d7cc8b3071f892

Simplify the registry-module-finding code: _winreg or win32api/win32con.
This'll work fine with 2.0 or 1.5.2, but is less than ideal for
1.6a1/a2.  But the code to accomodate 1.6a1/a2 was released with
Distutils 0.9, so it can go away now.

Lib/distutils/msvccompiler.py

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index ae5e2d7..e58e6c1 100644
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -20,10 +20,7 @@
 
 _can_read_reg = 0
 try:
-    try:
-        import _winreg
-    except ImportError:
-        import winreg                   # for pre-2000/06/29 CVS Python
+    import _winreg
 
     _can_read_reg = 1
     hkey_mod = _winreg