[Python-checkins] gh-93353: Fix importlib.resources._tempfile() finalizer (GH-93377)

Mon Jun 13 13:52:55 EDT 2022

https://github.com/python/cpython/commit/f9585e2adc36fb2886f96ef86a5aa14215fc1151
commit: f9585e2adc36fb2886f96ef86a5aa14215fc1151
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022年06月13日T10:52:50-07:00
summary:
gh-93353: Fix importlib.resources._tempfile() finalizer (GH-93377)
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 443ca731d6b1267fe2f92985e0490460c95e44a8)
Co-authored-by: Victor Stinner <vstinner at python.org>
files:
A Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst
M Lib/importlib/_common.py

diff --git a/Lib/importlib/_common.py b/Lib/importlib/_common.py
index 549fee379a415..84144c038c322 100644
--- a/Lib/importlib/_common.py
+++ b/Lib/importlib/_common.py
@@ -80,7 +80,10 @@ def from_package(package):
 
 
 @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'
 # blocks due to the need to close the temporary file to work on Windows
 # properly.
@@ -92,7 +95,7 @@ def _tempfile(reader, suffix=''):
 yield pathlib.Path(raw_path)
 finally:
 try:
- os.remove(raw_path)
+ _os_remove(raw_path)
 except FileNotFoundError:
 pass
 
diff --git a/Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst b/Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst
new file mode 100644
index 0000000000000..67be3c68f47cb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst
@@ -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.
