[Python-checkins] CVS: distutils/distutils util.py,1.49,1.50

[Greg Ward]

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

Modified Files:
	util.py 
Log Message:
Reformat docstrings.

Index: util.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/util.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** util.py	2000/09/30 17:09:39	1.49
--- util.py	2000/09/30 18:40:42	1.50
***************
*** 60,72 ****
  
  def convert_path (pathname):
!     """Return 'pathname' as a name that will work on the native
!        filesystem, i.e. split it on '/' and put it back together again
!        using the current directory separator.  Needed because filenames in
!        the setup script are always supplied in Unix style, and have to be
!        converted to the local convention before we can actually use them in
!        the filesystem.  Raises ValueError if 'pathname' is
!        absolute (starts with '/') or contains local directory separators
!        (unless the local separator is '/', of course)."""
! 
      if os.sep == '/':
          return pathname
--- 60,72 ----
  
  def convert_path (pathname):
!     """Return 'pathname' as a name that will work on the native filesystem,
!     i.e. split it on '/' and put it back together again using the current
!     directory separator.  Needed because filenames in the setup script are
!     always supplied in Unix style, and have to be converted to the local
!     convention before we can actually use them in the filesystem.  Raises
!     ValueError if 'pathname' is absolute (starts with '/') or contains
!     local directory separators (unless the local separator is '/', of
!     course).
!     """
      if os.sep == '/':
          return pathname
***************
*** 117,127 ****
  def check_environ ():
      """Ensure that 'os.environ' has all the environment variables we
!        guarantee that users can use in config files, command-line
!        options, etc.  Currently this includes:
!          HOME - user's home directory (Unix only)
!          PLAT - description of the current platform, including hardware
!                 and OS (see 'get_platform()')
      """
- 
      global _environ_checked
      if _environ_checked:
--- 117,126 ----
  def check_environ ():
      """Ensure that 'os.environ' has all the environment variables we
!     guarantee that users can use in config files, command-line options,
!     etc.  Currently this includes:
!       HOME - user's home directory (Unix only)
!       PLAT - description of the current platform, including hardware
!              and OS (see 'get_platform()')
      """
      global _environ_checked
      if _environ_checked:
***************
*** 139,151 ****
  
  def subst_vars (str, local_vars):
!     """Perform shell/Perl-style variable substitution on 'string'.
!        Every occurrence of '$' followed by a name, or a name enclosed in
!        braces, is considered a variable.  Every variable is substituted by
!        the value found in the 'local_vars' dictionary, or in 'os.environ'
!        if it's not in 'local_vars'.  'os.environ' is first checked/
!        augmented to guarantee that it contains certain values: see
!        '_check_environ()'.  Raise ValueError for any variables not found in
!        either 'local_vars' or 'os.environ'."""
! 
      check_environ()
      def _subst (match, local_vars=local_vars):
--- 138,150 ----
  
  def subst_vars (str, local_vars):
!     """Perform shell/Perl-style variable substitution on 'string'.  Every
!     occurrence of '$' followed by a name, or a name enclosed in braces, is
!     considered a variable.  Every variable is substituted by the value
!     found in the 'local_vars' dictionary, or in 'os.environ' if it's not in
!     'local_vars'.  'os.environ' is first checked/ augmented to guarantee
!     that it contains certain values: see '_check_environ()'.  Raise
!     ValueError for any variables not found in either 'local_vars' or
!     'os.environ'.
!     """
      check_environ()
      def _subst (match, local_vars=local_vars):