Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-87319: Simplify TemporaryDirectory cleanup using os.path.isjunction() (GH-112791)

This commit is contained in:
Serhiy Storchaka 2023-12-07 18:32:10 +02:00 committed by GitHub
parent 81c16cd94e
commit ba18893555
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/tempfile.py
View File

@ -41,7 +41,6 @@ import warnings as _warnings
import io as _io import io as _io
import os as _os import os as _os
import shutil as _shutil import shutil as _shutil
import stat as _stat
import errno as _errno import errno as _errno
from random import Random as _Random from random import Random as _Random
import sys as _sys import sys as _sys
@ -909,18 +908,7 @@ class TemporaryDirectory:
# raise NotADirectoryError and mask the PermissionError. # raise NotADirectoryError and mask the PermissionError.
# So we must re-raise the current PermissionError if # So we must re-raise the current PermissionError if
# path is not a directory. # path is not a directory.
try: if not _os.path.isdir(path) or _os.path.isjunction(path):
st = _os.lstat(path)
except OSError:
if ignore_errors:
return
raise
if (_stat.S_ISLNK(st.st_mode) or
not _stat.S_ISDIR(st.st_mode) or
(hasattr(st, 'st_file_attributes') and
st.st_file_attributes & _stat.FILE_ATTRIBUTE_REPARSE_POINT and
st.st_reparse_tag == _stat.IO_REPARSE_TAG_MOUNT_POINT)
):
if ignore_errors: if ignore_errors:
return return
raise raise