[Python-checkins] r69326 - in python/branches/py3k: Lib/distutils/dir_util.py Lib/distutils/file_util.py Lib/distutils/tests/test_dir_util.py Lib/distutils/tests/test_file_util.py Misc/NEWS
tarek.ziade
python-checkins at python.org
Fri Feb 6 01:38:35 CET 2009
Author: tarek.ziade
Date: Fri Feb 6 01:38:35 2009
New Revision: 69326
Log:
Merged revisions 69324 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69324 | tarek.ziade | 2009-02-06 01:31:59 +0100 (Fri, 06 Feb 2009) | 1 line
Fixed #1276768: verbose option was not used in the code.
........
Added:
python/branches/py3k/Lib/distutils/tests/test_dir_util.py
- copied unchanged from r69324, /python/trunk/Lib/distutils/tests/test_dir_util.py
python/branches/py3k/Lib/distutils/tests/test_file_util.py
- copied unchanged from r69324, /python/trunk/Lib/distutils/tests/test_file_util.py
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/dir_util.py
python/branches/py3k/Lib/distutils/file_util.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/distutils/dir_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/dir_util.py (original)
+++ python/branches/py3k/Lib/distutils/dir_util.py Fri Feb 6 01:38:35 2009
@@ -15,7 +15,7 @@
# I don't use os.makedirs because a) it's new to Python 1.5.2, and
# b) it blows up if the directory already exists (I want to silently
# succeed in that case).
-def mkpath (name, mode=0o777, verbose=0, dry_run=0):
+def mkpath (name, mode=0o777, verbose=1, dry_run=0):
"""Create a directory and any missing ancestor directories. If the
directory already exists (or if 'name' is the empty string, which
means the current directory, which of course exists), then do
@@ -48,13 +48,9 @@
tails = [tail] # stack of lone dirs to create
while head and tail and not os.path.isdir(head):
- #print "splitting '%s': " % head,
(head, tail) = os.path.split(head)
- #print "to ('%s','%s')" % (head, tail)
tails.insert(0, tail) # push next higher dir onto stack
- #print "stack of tails:", tails
-
# now 'head' contains the deepest directory that already exists
# (that is, the child of 'head' in 'name' is the highest directory
# that does *not* exist)
@@ -66,7 +62,8 @@
if _path_created.get(abs_head):
continue
- log.info("creating %s", head)
+ if verbose == 1:
+ log.info("creating %s", head)
if not dry_run:
try:
@@ -82,7 +79,7 @@
# mkpath ()
-def create_tree (base_dir, files, mode=0o777, verbose=0, dry_run=0):
+def create_tree (base_dir, files, mode=0o777, verbose=1, dry_run=0):
"""Create all the empty directories under 'base_dir' needed to
put 'files' there. 'base_dir' is just the a name of a directory
@@ -99,7 +96,7 @@
# Now create them
for dir in sorted(need_dir):
- mkpath(dir, mode, dry_run=dry_run)
+ mkpath(dir, mode, verbose=verbose, dry_run=dry_run)
# create_tree ()
@@ -109,7 +106,7 @@
preserve_times=1,
preserve_symlinks=0,
update=0,
- verbose=0,
+ verbose=1,
dry_run=0):
"""Copy an entire directory tree 'src' to a new location 'dst'. Both
@@ -146,7 +143,7 @@
"error listing files in '%s': %s" % (src, errstr))
if not dry_run:
- mkpath(dst)
+ mkpath(dst, verbose=verbose)
outputs = []
@@ -156,7 +153,8 @@
if preserve_symlinks and os.path.islink(src_name):
link_dest = os.readlink(src_name)
- log.info("linking %s -> %s", dst_name, link_dest)
+ if verbose == 1:
+ log.info("linking %s -> %s", dst_name, link_dest)
if not dry_run:
os.symlink(link_dest, dst_name)
outputs.append(dst_name)
@@ -165,10 +163,11 @@
outputs.extend(
copy_tree(src_name, dst_name, preserve_mode,
preserve_times, preserve_symlinks, update,
- dry_run=dry_run))
+ verbose=verbose, dry_run=dry_run))
else:
copy_file(src_name, dst_name, preserve_mode,
- preserve_times, update, dry_run=dry_run)
+ preserve_times, update, verbose=verbose,
+ dry_run=dry_run)
outputs.append(dst_name)
return outputs
@@ -184,14 +183,15 @@
cmdtuples.append((os.rmdir, path))
-def remove_tree (directory, verbose=0, dry_run=0):
+def remove_tree (directory, verbose=1, dry_run=0):
"""Recursively remove an entire directory tree. Any errors are ignored
(apart from being reported to stdout if 'verbose' is true).
"""
from distutils.util import grok_environment_error
global _path_created
- log.info("removing '%s' (and everything under it)", directory)
+ if verbose == 1:
+ log.info("removing '%s' (and everything under it)", directory)
if dry_run:
return
cmdtuples = []
Modified: python/branches/py3k/Lib/distutils/file_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/file_util.py (original)
+++ python/branches/py3k/Lib/distutils/file_util.py Fri Feb 6 01:38:35 2009
@@ -67,7 +67,7 @@
fsrc.close()
def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
- link=None, verbose=0, dry_run=0):
+ link=None, verbose=1, dry_run=0):
"""Copy a file 'src' to 'dst'. If 'dst' is a directory, then 'src' is
copied there with the same name; otherwise, it must be a filename. (If
the file exists, it will be ruthlessly clobbered.) If 'preserve_mode'
@@ -112,17 +112,20 @@
dir = os.path.dirname(dst)
if update and not newer(src, dst):
- log.debug("not copying %s (output up-to-date)", src)
+ if verbose == 1:
+ log.debug("not copying %s (output up-to-date)", src)
return (dst, 0)
try:
action = _copy_action[link]
except KeyError:
raise ValueError("invalid value '%s' for 'link' argument" % link)
- if os.path.basename(dst) == os.path.basename(src):
- log.info("%s %s -> %s", action, src, dir)
- else:
- log.info("%s %s -> %s", action, src, dst)
+
+ if verbose == 1:
+ if os.path.basename(dst) == os.path.basename(src):
+ log.info("%s %s -> %s", action, src, dir)
+ else:
+ log.info("%s %s -> %s", action, src, dst)
if dry_run:
return (dst, 1)
@@ -164,7 +167,7 @@
# XXX I suspect this is Unix-specific -- need porting help!
def move_file (src, dst,
- verbose=0,
+ verbose=1,
dry_run=0):
"""Move a file 'src' to 'dst'. If 'dst' is a directory, the file will
@@ -177,7 +180,8 @@
from os.path import exists, isfile, isdir, basename, dirname
import errno
- log.info("moving %s -> %s", src, dst)
+ if verbose == 1:
+ log.info("moving %s -> %s", src, dst)
if dry_run:
return dst
@@ -209,7 +213,7 @@
"couldn't move '%s' to '%s': %s" % (src, dst, msg))
if copy_it:
- copy_file(src, dst)
+ copy_file(src, dst, verbose=verbose)
try:
os.unlink(src)
except os.error as e:
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Feb 6 01:38:35 2009
@@ -155,6 +155,9 @@
Library
-------
+- Issue #1276768: The verbose option was not used in the code of
+ distutils.file_util and distutils.dir_util.
+
- Issue #5132: Fixed trouble building extensions under Solaris with
--enabled-shared activated. Initial patch by Dave Peterson.
More information about the Python-checkins
mailing list