[Python-checkins] CVS: distutils/distutils dep_util.py,1.1,1.2

[Greg Ward]

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

Modified Files:
	dep_util.py 
Log Message:
Reformat docstrings.
Standardize whitespace in function calls.

Index: dep_util.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/dep_util.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dep_util.py	2000/04/04 02:05:59	1.1
--- dep_util.py	2000/09/26 02:09:20	1.2
***************
*** 15,26 ****
  def newer (source, target):
      """Return true if 'source' exists and is more recently modified than
!        'target', or if 'source' exists and 'target' doesn't.  Return
!        false if both exist and 'target' is the same age or younger than
!        'source'.  Raise DistutilsFileError if 'source' does not
!        exist."""
! 
!     if not os.path.exists (source):
          raise DistutilsFileError, "file '%s' does not exist" % source
!     if not os.path.exists (target):
          return 1
  
--- 15,25 ----
  def newer (source, target):
      """Return true if 'source' exists and is more recently modified than
!     'target', or if 'source' exists and 'target' doesn't.  Return false if
!     both exist and 'target' is the same age or younger than 'source'.
!     Raise DistutilsFileError if 'source' does not exist.
!     """
!     if not os.path.exists(source):
          raise DistutilsFileError, "file '%s' does not exist" % source
!     if not os.path.exists(target):
          return 1
  
***************
*** 36,44 ****
  def newer_pairwise (sources, targets):
      """Walk two filename lists in parallel, testing if each source is newer
!        than its corresponding target.  Return a pair of lists (sources,
!        targets) where source is newer than target, according to the
!        semantics of 'newer()'."""
! 
!     if len (sources) != len (targets):
          raise ValueError, "'sources' and 'targets' must be same length"
  
--- 35,43 ----
  def newer_pairwise (sources, targets):
      """Walk two filename lists in parallel, testing if each source is newer
!     than its corresponding target.  Return a pair of lists (sources,
!     targets) where source is newer than target, according to the semantics
!     of 'newer()'.
!     """
!     if len(sources) != len(targets):
          raise ValueError, "'sources' and 'targets' must be same length"
  
***************
*** 46,53 ****
      n_sources = []
      n_targets = []
!     for i in range (len (sources)):
!         if newer (sources[i], targets[i]):
!             n_sources.append (sources[i])
!             n_targets.append (targets[i])
  
      return (n_sources, n_targets)
--- 45,52 ----
      n_sources = []
      n_targets = []
!     for i in range(len(sources)):
!         if newer(sources[i], targets[i]):
!             n_sources.append(sources[i])
!             n_targets.append(targets[i])
  
      return (n_sources, n_targets)
***************
*** 57,74 ****
  
  def newer_group (sources, target, missing='error'):
!     """Return true if 'target' is out-of-date with respect to any
!        file listed in 'sources'.  In other words, if 'target' exists and
!        is newer than every file in 'sources', return false; otherwise
!        return true.  'missing' controls what we do when a source file is
!        missing; the default ("error") is to blow up with an OSError from
!        inside 'stat()'; if it is "ignore", we silently drop any missing
!        source files; if it is "newer", any missing source files make us
!        assume that 'target' is out-of-date (this is handy in "dry-run"
!        mode: it'll make you pretend to carry out commands that wouldn't
!        work because inputs are missing, but that doesn't matter because
!        you're not actually going to run the commands)."""
! 
      # If the target doesn't even exist, then it's definitely out-of-date.
!     if not os.path.exists (target):
          return 1
     
--- 56,73 ----
  
  def newer_group (sources, target, missing='error'):
!     """Return true if 'target' is out-of-date with respect to any file
!     listed in 'sources'.  In other words, if 'target' exists and is newer
!     than every file in 'sources', return false; otherwise return true.
!     'missing' controls what we do when a source file is missing; the
!     default ("error") is to blow up with an OSError from inside 'stat()';
!     if it is "ignore", we silently drop any missing source files; if it is
!     "newer", any missing source files make us assume that 'target' is
!     out-of-date (this is handy in "dry-run" mode: it'll make you pretend to
!     carry out commands that wouldn't work because inputs are missing, but
!     that doesn't matter because you're not actually going to run the
!     commands).
!     """
      # If the target doesn't even exist, then it's definitely out-of-date.
!     if not os.path.exists(target):
          return 1
     
***************
*** 78,84 ****
      # of the loop, then 'target' is up-to-date and we return false.
      from stat import ST_MTIME
!     target_mtime = os.stat (target)[ST_MTIME]
      for source in sources:
!         if not os.path.exists (source):
              if missing == 'error':      # blow up when we stat() the file
                  pass                    
--- 77,83 ----
      # of the loop, then 'target' is up-to-date and we return false.
      from stat import ST_MTIME
!     target_mtime = os.stat(target)[ST_MTIME]
      for source in sources:
!         if not os.path.exists(source):
              if missing == 'error':      # blow up when we stat() the file
                  pass                    
***************
*** 103,113 ****
                 verbose=0, update_message=None, noupdate_message=None):
      """Makes 'dst' from 'src' (both filenames) by calling 'func' with
!        'args', but only if it needs to: i.e. if 'dst' does not exist or
!        'src' is newer than 'dst'."""
! 
!     if newer (src, dst):
          if verbose and update_message:
              print update_message
!         apply (func, args)
      else:
          if verbose and noupdate_message:
--- 102,112 ----
                 verbose=0, update_message=None, noupdate_message=None):
      """Makes 'dst' from 'src' (both filenames) by calling 'func' with
!     'args', but only if it needs to: i.e. if 'dst' does not exist or 'src'
!     is newer than 'dst'.
!     """
!     if newer(src, dst):
          if verbose and update_message:
              print update_message
!         apply(func, args)
      else:
          if verbose and noupdate_message: