traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix references to functions formerly imported from 'util'.

This commit is contained in:
Greg Ward 2000-08-13 00:36:47 +00:00
parent 20abf573ef
commit 29124ff4f2
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Lib/distutils/cmd.py
View File

@ -12,7 +12,7 @@ __revision__ = "$Id$"
import sys, os, string, re import sys, os, string, re
from types import * from types import *
from distutils.errors import * from distutils.errors import *
from distutils import util from distutils import util, dir_util, file_util, archive_util, dep_util
class Command: class Command:
@ -322,8 +322,8 @@ class Command:
def mkpath (self, name, mode=0777): def mkpath (self, name, mode=0777):
util.mkpath (name, mode, dir_util.mkpath(name, mode,
self.verbose, self.dry_run) self.verbose, self.dry_run)
def copy_file (self, infile, outfile, def copy_file (self, infile, outfile,
@ -332,12 +332,13 @@ class Command:
former two default to whatever is in the Distribution object, and former two default to whatever is in the Distribution object, and
the latter defaults to false for commands that don't define it.)""" the latter defaults to false for commands that don't define it.)"""
return util.copy_file (infile, outfile, return file_util.copy_file(
preserve_mode, preserve_times, infile, outfile,
not self.force, preserve_mode, preserve_times,
link, not self.force,
self.verbose >= level, link,
self.dry_run) self.verbose >= level,
self.dry_run)
def copy_tree (self, infile, outfile, def copy_tree (self, infile, outfile,
@ -346,18 +347,19 @@ class Command:
"""Copy an entire directory tree respecting verbose, dry-run, """Copy an entire directory tree respecting verbose, dry-run,
and force flags. and force flags.
""" """
return util.copy_tree (infile, outfile, return dir_util.copy_tree(
preserve_mode,preserve_times,preserve_symlinks, infile, outfile,
not self.force, preserve_mode,preserve_times,preserve_symlinks,
self.verbose >= level, not self.force,
self.dry_run) self.verbose >= level,
self.dry_run)
def move_file (self, src, dst, level=1): def move_file (self, src, dst, level=1):
"""Move a file respecting verbose and dry-run flags.""" """Move a file respecting verbose and dry-run flags."""
return util.move_file (src, dst, return file_util.move_file (src, dst,
self.verbose >= level, self.verbose >= level,
self.dry_run) self.dry_run)
def spawn (self, cmd, search_path=1, level=1): def spawn (self, cmd, search_path=1, level=1):
@ -370,8 +372,9 @@ class Command:
def make_archive (self, base_name, format, def make_archive (self, base_name, format,
root_dir=None, base_dir=None): root_dir=None, base_dir=None):
return util.make_archive (base_name, format, root_dir, base_dir, return archive_util.make_archive(
self.verbose, self.dry_run) base_name, format, root_dir, base_dir,
self.verbose, self.dry_run)
def make_file (self, infiles, outfile, func, args, def make_file (self, infiles, outfile, func, args,
@ -401,7 +404,7 @@ class Command:
# If 'outfile' must be regenerated (either because it doesn't # If 'outfile' must be regenerated (either because it doesn't
# exist, is out-of-date, or the 'force' flag is true) then # exist, is out-of-date, or the 'force' flag is true) then
# perform the action that presumably regenerates it # perform the action that presumably regenerates it
if self.force or util.newer_group (infiles, outfile): if self.force or dep_util.newer_group (infiles, outfile):
self.execute (func, args, exec_msg, level) self.execute (func, args, exec_msg, level)
# Otherwise, print the "skip" message # Otherwise, print the "skip" message