mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

gh-93353: Fix importlib.resources._tempfile() finalizer (GH-93377)

Browse source 
Fix the importlib.resources.as_file() context manager to remove the
temporary file if destroyed late during Python finalization: keep a
local reference to the os.remove() function. Patch by Victor Stinner.
(cherry picked from commit 443ca731d6)

Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
Miss Islington (bot) 2022-06-13 10:52:50 -07:00 • committed by GitHub
parent 58277de8e6
commit f9585e2adc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/importlib/_common.py
View file

@ -80,7 +80,10 @@ def from_package(package):
@contextlib.contextmanager @contextlib.contextmanager
def _tempfile(reader, suffix=''): def _tempfile(reader, suffix='',
# gh-93353: Keep a reference to call os.remove() in late Python
# finalization.
*, _os_remove=os.remove):
# Not using tempfile.NamedTemporaryFile as it leads to deeper 'try' # Not using tempfile.NamedTemporaryFile as it leads to deeper 'try'
# blocks due to the need to close the temporary file to work on Windows # blocks due to the need to close the temporary file to work on Windows
# properly. # properly.
@ -92,7 +95,7 @@ def _tempfile(reader, suffix=''):
yield pathlib.Path(raw_path) yield pathlib.Path(raw_path)
finally: finally:
try: try:
os.remove(raw_path) _os_remove(raw_path)
except FileNotFoundError: except FileNotFoundError:
pass pass

3
Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst Normal file
View file

@ -0,0 +1,3 @@
Fix the :func:`importlib.resources.as_file` context manager to remove the
temporary file if destroyed late during Python finalization: keep a local
reference to the :func:`os.remove` function. Patch by Victor Stinner.