mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Issue #16706: get rid of os.error

Browse source
This commit is contained in:
Andrew Svetlov 2012-12-18 22:02:39 +02:00
parent a191959849
commit ad28c7f9da
33 changed files with 4089 additions and 4123 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/shutil.py
View file

@ -356,24 +356,24 @@ def _rmtree_unsafe(path, onerror):
names = []
try:
names = os.listdir(path)
except os.error:
except OSError:
onerror(os.listdir, path, sys.exc_info())
for name in names:
fullname = os.path.join(path, name)
try:
mode = os.lstat(fullname).st_mode
except os.error:
except OSError:
mode = 0
if stat.S_ISDIR(mode):
_rmtree_unsafe(fullname, onerror)
else:
try:
os.unlink(fullname)
except os.error:
except OSError:
onerror(os.unlink, fullname, sys.exc_info())
try:
os.rmdir(path)
except os.error:
except OSError:
onerror(os.rmdir, path, sys.exc_info())
# Version using fd-based APIs to protect against races
@ -464,7 +464,7 @@ def rmtree(path, ignore_errors=False, onerror=None):
_rmtree_safe_fd(fd, path, onerror)
try:
os.rmdir(path)
except os.error:
except OSError:
onerror(os.rmdir, path, sys.exc_info())
else:
try: