From: Greg Ward <gward@python.net>
Date: Fri, 30 Jun 2000 19:37:59 +0000 (+0000)
Subject: Simplify the registry-module-finding code: _winreg or win32api/win32con.
X-Git-Tag: v2.0b1~1190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5ec76190dba6c488a7617731050f7a870260ab;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index ae5e2d767a6e..e58e6c10c81f 100644
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -20,10 +20,7 @@ from distutils.ccompiler import \
 
 _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