[Python-checkins] CVS: distutils/distutils msvccompiler.py,1.34,1.35

[Greg Ward]

Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30132

Modified Files:
	msvccompiler.py 
Log Message:
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.


Index: msvccompiler.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/msvccompiler.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** msvccompiler.py	2000/06/29 23:04:59	1.34
--- msvccompiler.py	2000/06/30 19:37:59	1.35
***************
*** 21,28 ****
  _can_read_reg = 0
  try:
!     try:
!         import _winreg
!     except ImportError:
!         import winreg                   # for pre-2000/06/29 CVS Python
  
      _can_read_reg = 1
--- 21,25 ----
  _can_read_reg = 0
  try:
!     import _winreg
  
      _can_read_reg = 1