summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ward <gward@python.net>1999-04-04 02:46:29 (GMT)
committerGreg Ward <gward@python.net>1999-04-04 02:46:29 (GMT)
commit4070f50537fd1945d2ecbb9d4e72aeba7e72fa55 (patch)
treea4ab0319733d1e159e39442d523712008a79f134
parentbd3bdde70bebd5f56f163dab7e6d8a04ff973013 (diff)
downloadcpython-4070f50537fd1945d2ecbb9d4e72aeba7e72fa55.zip
cpython-4070f50537fd1945d2ecbb9d4e72aeba7e72fa55.tar.gz
cpython-4070f50537fd1945d2ecbb9d4e72aeba7e72fa55.tar.bz2
Changed to use the method versions of 'copy_file()', 'copy_tree()',
and 'make_file()'-- that way, the verbose and dry-run flags are handled for free.
-rw-r--r--Lib/distutils/command/build_py.py11
-rw-r--r--Lib/distutils/command/install_lib.py4
-rw-r--r--Lib/distutils/command/install_py.py4
3 files changed, 7 insertions, 12 deletions
diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
index ae133f9..0ed8486 100644
--- a/Lib/distutils/command/build_py.py
+++ b/Lib/distutils/command/build_py.py
@@ -84,11 +84,10 @@ class BuildPy (Command):
for i in range (len (infiles)):
outdir = os.path.split (outfiles[i])[0]
if not created.get(outdir):
- mkpath (outdir, verbose=self.distribution.verbose)
+ self.mkpath (outdir)
created[outdir] = 1
- copy_file (infiles[i], outfiles[i],
- update=1, verbose=self.distribution.verbose)
+ self.copy_file (infiles[i], outfiles[i])
# (Optionally) compile .py to .pyc
# XXX hey! we can't control whether we optimize or not; that's up
@@ -102,9 +101,9 @@ class BuildPy (Command):
# XXX can't assume this filename mapping!
out_fn = string.replace (f, '.py', '.pyc')
- make_file (f, out_fn, compile, (f,),
- verbose=self.distribution.verbose,
- update_message="compiling %s" % f)
+ self.make_file (f, out_fn, compile, (f,),
+ "compiling %s -> %s" % (f, out_fn),
+ "compilation of %s skipped" % f)
# XXX ignore self.optimize for now, since we don't really know if
# we're compiling optimally or not, and couldn't pick what to do
diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py
index f2fa842..22ab71e 100644
--- a/Lib/distutils/command/install_lib.py
+++ b/Lib/distutils/command/install_lib.py
@@ -33,9 +33,7 @@ class InstallPy (Command):
# Dump entire contents of the build directory to the installation
# directory (that's the beauty of having a build directory!)
- copy_tree (self.build_dir, self.dir,
- verbose=self.distribution.verbose,
- update=1)
+ self.copy_tree (self.build_dir, self.dir)
# run ()
diff --git a/Lib/distutils/command/install_py.py b/Lib/distutils/command/install_py.py
index f2fa842..22ab71e 100644
--- a/Lib/distutils/command/install_py.py
+++ b/Lib/distutils/command/install_py.py
@@ -33,9 +33,7 @@ class InstallPy (Command):
# Dump entire contents of the build directory to the installation
# directory (that's the beauty of having a build directory!)
- copy_tree (self.build_dir, self.dir,
- verbose=self.distribution.verbose,
- update=1)
+ self.copy_tree (self.build_dir, self.dir)
# run ()