[Python-checkins] CVS: python/dist/src/Lib/distutils sysconfig.py,1.34.6.1,1.34.6.2 util.py,1.63,1.63.4.1

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	sysconfig.py util.py 
Log Message:
Merge of trunk delta date2001-07-17b to date2001-07-21.  See PLAN.txt.


Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.34.6.1
retrieving revision 1.34.6.2
diff -C2 -r1.34.6.1 -r1.34.6.2
*** sysconfig.py	2001/07/07 22:55:28	1.34.6.1
--- sysconfig.py	2001/07/21 06:07:12	1.34.6.2
***************
*** 1,4 ****
! """Provide access to Python's configuration information.  The specific names
! defined in the module depend heavily on the platform and configuration.
  
  Written by:   Fred L. Drake, Jr.
--- 1,8 ----
! """Provide access to Python's configuration information.  The specific
! configuration variables available depend heavily on the platform and
! configuration.  The values may be retrieved using
! get_config_var(name), and the list of variables is available via
! get_config_vars().keys().  Additional convenience functions are also
! available.
  
  Written by:   Fred L. Drake, Jr.
***************
*** 46,50 ****
      """    
      if prefix is None:
!         prefix = (plat_specific and EXEC_PREFIX or PREFIX)
      if os.name == "posix":
          if python_build:
--- 50,54 ----
      """    
      if prefix is None:
!         prefix = plat_specific and EXEC_PREFIX or PREFIX
      if os.name == "posix":
          if python_build:
***************
*** 56,62 ****
          return os.path.join(prefix, "Include")
      else:
!         raise DistutilsPlatformError, \
!               ("I don't know where Python installs its C header files " +
!                "on platform '%s'") % os.name
  
  
--- 60,66 ----
          return os.path.join(prefix, "Include")
      else:
!         raise DistutilsPlatformError(
!             "I don't know where Python installs its C header files "
!             "on platform '%s'" % os.name)
  
  
***************
*** 76,80 ****
      """
      if prefix is None:
!         prefix = (plat_specific and EXEC_PREFIX or PREFIX)
         
      if os.name == "posix":
--- 80,84 ----
      """
      if prefix is None:
!         prefix = plat_specific and EXEC_PREFIX or PREFIX
         
      if os.name == "posix":
***************
*** 97,117 ****
                  return os.path.join(EXEC_PREFIX, "Mac", "Plugins")
              else:
!                 raise DistutilsPlatformError, \
!                       "OK, where DO site-specific extensions go on the Mac?"
          else:
              if standard_lib:
                  return os.path.join(PREFIX, "Lib")
              else:
!                 raise DistutilsPlatformError, \
!                       "OK, where DO site-specific modules go on the Mac?"
      else:
!         raise DistutilsPlatformError, \
!               ("I don't know where Python installs its library " +
!                "on platform '%s'") % os.name
  
  # get_python_lib()
          
  
! def customize_compiler (compiler):
      """Do any platform-specific customization of the CCompiler instance
      'compiler'.  Mainly needed on Unix, so we can plug in the information
--- 101,121 ----
                  return os.path.join(EXEC_PREFIX, "Mac", "Plugins")
              else:
!                 raise DistutilsPlatformError(
!                     "OK, where DO site-specific extensions go on the Mac?")
          else:
              if standard_lib:
                  return os.path.join(PREFIX, "Lib")
              else:
!                 raise DistutilsPlatformError(
!                     "OK, where DO site-specific modules go on the Mac?")
      else:
!         raise DistutilsPlatformError(
!             "I don't know where Python installs its library "
!             "on platform '%s'" % os.name)
  
  # get_python_lib()
          
  
! def customize_compiler(compiler):
      """Do any platform-specific customization of the CCompiler instance
      'compiler'.  Mainly needed on Unix, so we can plug in the information
***************
*** 300,304 ****
              my_msg = my_msg + " (%s)" % msg.strerror
  
!         raise DistutilsPlatformError, my_msg
                
      
--- 304,308 ----
              my_msg = my_msg + " (%s)" % msg.strerror
  
!         raise DistutilsPlatformError(my_msg)
                
      

Index: util.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/util.py,v
retrieving revision 1.63
retrieving revision 1.63.4.1
diff -C2 -r1.63 -r1.63.4.1
*** util.py	2001/03/23 17:30:26	1.63
--- util.py	2001/07/21 06:07:13	1.63.4.1
***************
*** 63,66 ****
--- 63,67 ----
          return "%s-%s.%s" % (osname, version, release)
      elif osname[:6] == "cygwin":
+         osname = "cygwin"
          rel_re = re.compile (r'[\d.]+')
          m = rel_re.match(release)