[Python-checkins] CVS: distutils/distutils unixccompiler.py,1.24,1.25 msvccompiler.py,1.29,1.30

Greg Ward python-dev@python.org
Mon, 29 May 2000 19:02:51 -0700


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

Modified Files:
	unixccompiler.py msvccompiler.py 
Log Message:
Import exceptions from errors.py, not ccompiler.py.

Index: unixccompiler.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/unixccompiler.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** unixccompiler.py	2000/05/30 01:56:44	1.24
--- unixccompiler.py	2000/05/30 02:02:49	1.25
***************
*** 16,20 ****
  # created 1999/07/05, Greg Ward
  
! __revision__ = "$Id: unixccompiler.py,v 1.24 2000/05/30 01:56:44 gward Exp $"
  
  import string, re, os
--- 16,20 ----
  # created 1999/07/05, Greg Ward
  
! __revision__ = "$Id: unixccompiler.py,v 1.25 2000/05/30 02:02:49 gward Exp $"
  
  import string, re, os
***************
*** 23,29 ****
  from distutils import sysconfig
  from distutils.ccompiler import \
!      CCompiler, gen_preprocess_options, gen_lib_options, \
!      CompileError, LibError, LinkError
! from distutils.errors import DistutilsExecError
  
  # XXX Things not currently handled:
--- 23,29 ----
  from distutils import sysconfig
  from distutils.ccompiler import \
!      CCompiler, gen_preprocess_options, gen_lib_options
! from distutils.errors import \
!      DistutilsExecError, CompileError, LibError, LinkError
  
  # XXX Things not currently handled:

Index: msvccompiler.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/msvccompiler.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** msvccompiler.py	2000/05/30 01:56:44	1.29
--- msvccompiler.py	2000/05/30 02:02:49	1.30
***************
*** 9,21 ****
  #   finding DevStudio (through the registry)
  
! __revision__ = "$Id: msvccompiler.py,v 1.29 2000/05/30 01:56:44 gward Exp $"
  
  import sys, os, string
  from types import *
! from distutils.errors import *
! from distutils.ccompiler import \
!      CCompiler, gen_preprocess_options, gen_lib_options, \
       CompileError, LibError, LinkError
! 
  
  _can_read_reg = 0
--- 9,21 ----
  #   finding DevStudio (through the registry)
  
! __revision__ = "$Id: msvccompiler.py,v 1.30 2000/05/30 02:02:49 gward Exp $"
  
  import sys, os, string
  from types import *
! from distutils.errors import \
!      DistutilsExecError, DistutilsPlatformError, \
       CompileError, LibError, LinkError
! from distutils.ccompiler import \
!      CCompiler, gen_preprocess_options, gen_lib_options
  
  _can_read_reg = 0