[Python-checkins] python/dist/src setup.py,1.146,1.147

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30600

Modified Files:
	setup.py 
Log Message:
Don't use self.announce() in a function that's not a method.

Use level=3 (i.e. log.WARN) for the warnings about failed imports.
(Hmm...  Why is that code in an "if 1: ..."?  What's the else branch
for?)


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** setup.py	18 Feb 2003 10:24:34 -0000	1.146
--- setup.py	20 Feb 2003 02:11:43 -0000	1.147
***************
*** 89,93 ****
          return module
      if len(list) > 1:
!         self.announce("WARNING: multiple copies of %s found"%module)
      return os.path.join(list[0], module)
  
--- 89,93 ----
          return module
      if len(list) > 1:
!         log.info("WARNING: multiple copies of %s found"%module)
      return os.path.join(list[0], module)
  
***************
*** 212,216 ****
              if 1:
                  self.announce('*** WARNING: renaming "%s" since importing it'
!                               ' failed: %s' % (ext.name, why))
                  assert not self.inplace
                  basename, tail = os.path.splitext(ext_filename)
--- 212,216 ----
              if 1:
                  self.announce('*** WARNING: renaming "%s" since importing it'
!                               ' failed: %s' % (ext.name, why), level=3)
                  assert not self.inplace
                  basename, tail = os.path.splitext(ext_filename)
***************
*** 232,236 ****
              else:
                  self.announce('*** WARNING: importing extension "%s" '
!                               'failed: %s' % (ext.name, why))
  
      def get_platform (self):
--- 232,236 ----
              else:
                  self.announce('*** WARNING: importing extension "%s" '
!                               'failed: %s' % (ext.name, why), level=3)
  
      def get_platform (self):