From e2f0c3f7f849dc95d6503616191b745da4049702 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Tue, 31 May 2022 14:54:57 +0200
Subject: [PATCH] gh-93353: Fix importlib.resources._tempfile() finalizer
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.
---
Lib/importlib/resources/_common.py | 7 +++++--
.../Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst
diff --git a/Lib/importlib/resources/_common.py b/Lib/importlib/resources/_common.py
index 147ea19188f718..ca1fa8ab2fe6ff 100644
--- a/Lib/importlib/resources/_common.py
+++ b/Lib/importlib/resources/_common.py
@@ -67,7 +67,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.
@@ -81,7 +84,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 00000000000000..67be3c68f47cba
--- /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.