[Python-checkins] CVS: distutils/distutils/command install.py,1.35,1.36 sdist.py,1.21,1.22

Greg Ward python-dev@python.org
Tue, 30 May 2000 19:32:12 -0700


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

Modified Files:
	install.py sdist.py 
Log Message:
Renamed 'native_path()' to 'convert_path()'.
Also changed it so it doesn't barf if the path is already in native format
  (ie. contains os.sep).

Index: install.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** install.py	2000/05/28 23:47:31	1.35
--- install.py	2000/05/31 02:32:10	1.36
***************
*** 5,9 ****
  # created 1999/03/13, Greg Ward
  
! __revision__ = "$Id: install.py,v 1.35 2000/05/28 23:47:31 gward Exp $"
  
  import sys, os, string
--- 5,9 ----
  # created 1999/03/13, Greg Ward
  
! __revision__ = "$Id: install.py,v 1.36 2000/05/31 02:32:10 gward Exp $"
  
  import sys, os, string
***************
*** 11,15 ****
  from distutils.core import Command, DEBUG
  from distutils import sysconfig
! from distutils.util import write_file, native_path, subst_vars, change_root
  from distutils.errors import DistutilsOptionError
  from glob import glob
--- 11,15 ----
  from distutils.core import Command, DEBUG
  from distutils import sysconfig
! from distutils.util import write_file, convert_path, subst_vars, change_root
  from distutils.errors import DistutilsOptionError
  from glob import glob
***************
*** 424,428 ****
              # convert to local form in case Unix notation used (as it
              # should be in setup scripts)
!             extra_dirs = native_path (extra_dirs)
  
          else:
--- 424,428 ----
              # convert to local form in case Unix notation used (as it
              # should be in setup scripts)
!             extra_dirs = convert_path (extra_dirs)
  
          else:

Index: sdist.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/sdist.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** sdist.py	2000/05/27 17:27:23	1.21
--- sdist.py	2000/05/31 02:32:10	1.22
***************
*** 5,9 ****
  # created 1999/09/22, Greg Ward
  
! __revision__ = "$Id: sdist.py,v 1.21 2000/05/27 17:27:23 gward Exp $"
  
  import sys, os, string, re
--- 5,9 ----
  # created 1999/09/22, Greg Ward
  
! __revision__ = "$Id: sdist.py,v 1.22 2000/05/31 02:32:10 gward Exp $"
  
  import sys, os, string, re
***************
*** 12,16 ****
  from glob import glob
  from distutils.core import Command
! from distutils.util import newer, create_tree, remove_tree, native_path, \
       write_file
  from distutils.archive_util import check_archive_formats
--- 12,16 ----
  from glob import glob
  from distutils.core import Command
! from distutils.util import newer, create_tree, remove_tree, convert_path, \
       write_file
  from distutils.archive_util import check_archive_formats
***************
*** 323,327 ****
                      continue
  
!                 pattern_list = map(native_path, words[1:])
  
              elif action in ('recursive-include','recursive-exclude'):
--- 323,327 ----
                      continue
  
!                 pattern_list = map(convert_path, words[1:])
  
              elif action in ('recursive-include','recursive-exclude'):
***************
*** 333,338 ****
                      continue
  
!                 dir = native_path(words[1])
!                 pattern_list = map (native_path, words[2:])
  
              elif action in ('graft','prune'):
--- 333,338 ----
                      continue
  
!                 dir = convert_path(words[1])
!                 pattern_list = map (convert_path, words[2:])
  
              elif action in ('graft','prune'):
***************
*** 344,348 ****
                      continue
  
!                 dir_pattern = native_path (words[1])
  
              else:
--- 344,348 ----
                      continue
  
!                 dir_pattern = convert_path (words[1])
  
              else: