[Python-checkins] python/dist/src/Lib/distutils filelist.py,1.12,1.13 dist.py,1.55,1.56 core.py,1.50,1.51 cmd.py,1.30,1.31 ccompiler.py,1.46,1.47

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv18061

Modified Files:
	filelist.py dist.py core.py cmd.py ccompiler.py 
Log Message:
Use distutils.debug.DEBUG instead of distutils.core.DEBUG.

Note that distutils.core.DEBUG still works if client code uses it, but
the core code avoids circular references by using distutils.debug.



Index: filelist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/filelist.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** filelist.py	4 Jun 2002 21:04:03 -0000	1.12
--- filelist.py	11 Sep 2002 16:31:52 -0000	1.13
***************
*** 55,59 ****
          DISTUTILS_DEBUG environment variable) flag is true.
          """
!         from distutils.core import DEBUG
          if DEBUG:
              print msg
--- 55,59 ----
          DISTUTILS_DEBUG environment variable) flag is true.
          """
!         from distutils.debug import DEBUG
          if DEBUG:
              print msg

Index: dist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dist.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** dist.py	4 Jun 2002 21:02:26 -0000	1.55
--- dist.py	11 Sep 2002 16:31:52 -0000	1.56
***************
*** 17,21 ****
  from distutils.util import check_environ, strtobool, rfc822_escape
  from distutils import log
! from distutils.core import DEBUG
  
  # Regex to define acceptable Distutils command names.  This is not *quite*
--- 17,21 ----
  from distutils.util import check_environ, strtobool, rfc822_escape
  from distutils import log
! from distutils.debug import DEBUG
  
  # Regex to define acceptable Distutils command names.  This is not *quite*

Index: core.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/core.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** core.py	4 Jun 2002 21:05:05 -0000	1.50
--- core.py	11 Sep 2002 16:31:52 -0000	1.51
***************
*** 14,21 ****
  from types import *
  
! # If DISTUTILS_DEBUG is anything other than the empty string, we run in
! # debug mode.
! DEBUG = os.environ.get('DISTUTILS_DEBUG')
! 
  from distutils.errors import *
  from distutils.util import grok_environment_error
--- 14,18 ----
  from types import *
  
! from distutils.debug import DEBUG
  from distutils.errors import *
  from distutils.util import grok_environment_error
***************
*** 25,29 ****
  from distutils.cmd import Command
  from distutils.extension import Extension
- 
  
  # This is a barebones help message generated displayed when the user
--- 22,25 ----

Index: cmd.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/cmd.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** cmd.py	4 Jun 2002 20:14:42 -0000	1.30
--- cmd.py	11 Sep 2002 16:31:52 -0000	1.31
***************
*** 199,203 ****
          DISTUTILS_DEBUG environment variable) flag is true.
          """
!         from distutils.core import DEBUG
          if DEBUG:
              print msg
--- 199,203 ----
          DISTUTILS_DEBUG environment variable) flag is true.
          """
!         from distutils.debug import DEBUG
          if DEBUG:
              print msg

Index: ccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/ccompiler.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ccompiler.py	18 Jun 2002 18:42:41 -0000	1.46
--- ccompiler.py	11 Sep 2002 16:31:53 -0000	1.47
***************
*** 924,928 ****
  
      def debug_print (self, msg):
!         from distutils.core import DEBUG
          if DEBUG:
              print msg
--- 924,928 ----
  
      def debug_print (self, msg):
!         from distutils.debug import DEBUG
          if DEBUG:
              print msg