summaryrefslogtreecommitdiff
path: root/Lib/distutils/dir_util.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-08-31 18:02:18 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-08-31 18:02:18 -0400
commit71a8eed6150a83ba0ed652401277e6d17773955c (patch)
tree85db06513f53e48b21e2253287175165fc57e359 /Lib/distutils/dir_util.py
parentc49a6aa1f004ec8399dfc2a326ccc39b658ec5b4 (diff)
parent311321edc15d4062babf757e3827341633353d55 (diff)
downloadcpython-git-71a8eed6150a83ba0ed652401277e6d17773955c.tar.gz
Merge with 3.4; Closes #22315
Diffstat (limited to 'Lib/distutils/dir_util.py')
-rw-r--r--Lib/distutils/dir_util.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py
index 9879b0dc07..0924c9b0f7 100644
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@ -125,12 +125,11 @@ def copy_tree(src, dst, preserve_mode=1, preserve_times=1,
try:
names = os.listdir(src)
except OSError as e:
- (errno, errstr) = e
if dry_run:
names = []
else:
raise DistutilsFileError(
- "error listing files in '%s': %s" % (src, errstr))
+ "error listing files in '%s': %s" % (src, e.strerror))
if not dry_run:
mkpath(dst, verbose=verbose)