summaryrefslogtreecommitdiff
path: root/Tools/scripts/linktree.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-28 08:08:09 +0100
committerGeorg Brandl <georg@python.org>2013-10-28 08:08:09 +0100
commit03b9c293da396efd6df7fb0d980db0faa8bb4b49 (patch)
tree9d1da9bb4648df90b7f435bc5eadc38c26da011e /Tools/scripts/linktree.py
parentbc3101edfd79f9d63af2f7503c94e1c5390f9074 (diff)
parent8d7b2d90166762520cd2f911bb3bcaf71c41c98c (diff)
downloadcpython-03b9c293da396efd6df7fb0d980db0faa8bb4b49.tar.gz
null merge with 3.3
Diffstat (limited to 'Tools/scripts/linktree.py')
-rwxr-xr-xTools/scripts/linktree.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/scripts/linktree.py b/Tools/scripts/linktree.py
index 982f4800ba..e83f198593 100755
--- a/Tools/scripts/linktree.py
+++ b/Tools/scripts/linktree.py
@@ -32,13 +32,13 @@ def main():
return 1
try:
os.mkdir(newtree, 0o777)
- except os.error as msg:
+ except OSError as msg:
print(newtree + ': cannot mkdir:', msg)
return 1
linkname = os.path.join(newtree, link)
try:
os.symlink(os.path.join(os.pardir, oldtree), linkname)
- except os.error as msg:
+ except OSError as msg:
if not link_may_fail:
print(linkname + ': cannot symlink:', msg)
return 1
@@ -51,7 +51,7 @@ def linknames(old, new, link):
if debug: print('linknames', (old, new, link))
try:
names = os.listdir(old)
- except os.error as msg:
+ except OSError as msg:
print(old + ': warning: cannot listdir:', msg)
return
for name in names: