mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

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

7
Lib/tempfile.py
View file

@ -665,7 +665,6 @@ class TemporaryDirectory(object):
_islink = staticmethod(_os.path.islink)
_remove = staticmethod(_os.remove)
_rmdir = staticmethod(_os.rmdir)
_os_error = OSError
_warn = _warnings.warn
def _rmtree(self, path):
@ -675,16 +674,16 @@ class TemporaryDirectory(object):
fullname = self._path_join(path, name)
try:
isdir = self._isdir(fullname) and not self._islink(fullname)
except self._os_error:
except OSError:
isdir = False
if isdir:
self._rmtree(fullname)
else:
try:
self._remove(fullname)
except self._os_error:
except OSError:
pass
try:
self._rmdir(path)
except self._os_error:
except OSError:
pass