[Python-checkins] CVS: distutils/distutils cmd.py,1.21,1.22

[Greg Ward]

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

Modified Files:
	cmd.py 
Log Message:
Fix references to functions formerly imported from 'util'.

Index: cmd.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/cmd.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** cmd.py	2000/08/02 01:37:53	1.21
--- cmd.py	2000/08/13 00:36:47	1.22
***************
*** 13,17 ****
  from types import *
  from distutils.errors import *
! from distutils import util
  
  
--- 13,17 ----
  from types import *
  from distutils.errors import *
! from distutils import util, dir_util, file_util, archive_util, dep_util
  
  
***************
*** 323,328 ****
  
      def mkpath (self, name, mode=0777):
!         util.mkpath (name, mode,
!                      self.verbose, self.dry_run)
  
  
--- 323,328 ----
  
      def mkpath (self, name, mode=0777):
!         dir_util.mkpath(name, mode,
!                         self.verbose, self.dry_run)
  
  
***************
*** 333,342 ****
          the latter defaults to false for commands that don't define it.)"""
  
!         return util.copy_file (infile, outfile,
!                                preserve_mode, preserve_times,
!                                not self.force,
!                                link,
!                                self.verbose >= level,
!                                self.dry_run)
  
  
--- 333,343 ----
          the latter defaults to false for commands that don't define it.)"""
  
!         return file_util.copy_file(
!             infile, outfile,
!             preserve_mode, preserve_times,
!             not self.force,
!             link,
!             self.verbose >= level,
!             self.dry_run)
  
  
***************
*** 347,362 ****
          and force flags.
          """
!         return util.copy_tree (infile, outfile, 
!                                preserve_mode,preserve_times,preserve_symlinks,
!                                not self.force,
!                                self.verbose >= level,
!                                self.dry_run)
  
  
      def move_file (self, src, dst, level=1):
          """Move a file respecting verbose and dry-run flags."""
!         return util.move_file (src, dst,
!                                self.verbose >= level,
!                                self.dry_run)
  
  
--- 348,364 ----
          and force flags.
          """
!         return dir_util.copy_tree(
!             infile, outfile, 
!             preserve_mode,preserve_times,preserve_symlinks,
!             not self.force,
!             self.verbose >= level,
!             self.dry_run)
  
  
      def move_file (self, src, dst, level=1):
          """Move a file respecting verbose and dry-run flags."""
!         return file_util.move_file (src, dst,
!                                     self.verbose >= level,
!                                     self.dry_run)
  
  
***************
*** 371,376 ****
      def make_archive (self, base_name, format,
                        root_dir=None, base_dir=None):
!         return util.make_archive (base_name, format, root_dir, base_dir,
!                                   self.verbose, self.dry_run)
  
  
--- 373,379 ----
      def make_archive (self, base_name, format,
                        root_dir=None, base_dir=None):
!         return archive_util.make_archive(
!             base_name, format, root_dir, base_dir,
!             self.verbose, self.dry_run)
  
  
***************
*** 402,406 ****
          # exist, is out-of-date, or the 'force' flag is true) then
          # perform the action that presumably regenerates it
!         if self.force or util.newer_group (infiles, outfile):
              self.execute (func, args, exec_msg, level)
  
--- 405,409 ----
          # exist, is out-of-date, or the 'force' flag is true) then
          # perform the action that presumably regenerates it
!         if self.force or dep_util.newer_group (infiles, outfile):
              self.execute (func, args, exec_msg, level)