diff options
| author | Éric Araujo <merwok@netwok.org> | 2014-03-12 08:10:51 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2014-03-12 08:10:51 (GMT) |
| commit | a0fe1f74f928bec969dad25e8dc97b560748b182 (patch) | |
| tree | cd4aebc7d8e5ed6d8e7671013cb464e3f6af608d /Lib/distutils/dir_util.py | |
| parent | 03a4da55cba54bd7237c686ae39cf175f723c785 (diff) | |
| parent | fc773a2d4ba3810b982e703bf8a240206369e5d1 (diff) | |
| download | cpython-a0fe1f74f928bec969dad25e8dc97b560748b182.zip cpython-a0fe1f74f928bec969dad25e8dc97b560748b182.tar.gz cpython-a0fe1f74f928bec969dad25e8dc97b560748b182.tar.bz2 | |
Merge 3.3 (#4931)
Diffstat (limited to 'Lib/distutils/dir_util.py')
| -rw-r--r-- | Lib/distutils/dir_util.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py index 2b35aa3..9879b0d 100644 --- a/Lib/distutils/dir_util.py +++ b/Lib/distutils/dir_util.py @@ -2,7 +2,7 @@ Utility functions for manipulating directories and directory trees.""" -import os, sys +import os import errno from distutils.errors import DistutilsFileError, DistutilsInternalError from distutils import log @@ -182,7 +182,6 @@ def remove_tree(directory, verbose=1, dry_run=0): Any errors are ignored (apart from being reported to stdout if 'verbose' is true). """ - from distutils.util import grok_environment_error global _path_created if verbose >= 1: @@ -199,8 +198,7 @@ def remove_tree(directory, verbose=1, dry_run=0): if abspath in _path_created: del _path_created[abspath] except OSError as exc: - log.warn(grok_environment_error( - exc, "error removing %s: " % directory)) + log.warn("error removing %s: %s", directory, exc) def ensure_relative(path): """Take the full path 'path', and make it a relative path. |