From ee532fbc5adfaef05ee6d7feded81672193b214c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 12 Mar 2024 17:36:21 -0400
Subject: [PATCH] [3.11] gh-116307: Proper fix for 'mod' leaking across
 importlib tests (GH-116680) (cherry picked from commit
 a2548077614f81f25a2c3465dabb7a0a3885c40c)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
gh-116307: Create a new import helper 'isolated modules' and use that instead of 'Clean Import' to ensure that tests from importlib_resources don't leave modules in sys.modules.
---
 Lib/test/support/import_helper.py             | 20 +++++++++++++++++++
 ...-03-06-11-00-36.gh-issue-116307.Uij0t_.rst |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Tests/2024-03-06-11-00-36.gh-issue-116307.Uij0t_.rst

diff --git a/Lib/test/support/import_helper.py b/Lib/test/support/import_helper.py
index a803d9f1b4039a..8519194381a6ad 100644
--- a/Lib/test/support/import_helper.py
+++ b/Lib/test/support/import_helper.py
@@ -248,6 +248,26 @@ def modules_cleanup(oldmodules):
     sys.modules.update(oldmodules)
 
 
+@contextlib.contextmanager
+def isolated_modules():
+    """
+    Save modules on entry and cleanup on exit.
+    """
+    (saved,) = modules_setup()
+    try:
+        yield
+    finally:
+        modules_cleanup(saved)
+
+
+def mock_register_at_fork(func):
+    # bpo-30599: Mock os.register_at_fork() when importing the random module,
+    # since this function doesn't allow to unregister callbacks and would leak
+    # memory.
+    from unittest import mock
+    return mock.patch('os.register_at_fork', create=True)(func)
+
+
 @contextlib.contextmanager
 def ready_to_import(name=None, source=""):
     from test.support import script_helper
diff --git a/Misc/NEWS.d/next/Tests/2024-03-06-11-00-36.gh-issue-116307.Uij0t_.rst b/Misc/NEWS.d/next/Tests/2024-03-06-11-00-36.gh-issue-116307.Uij0t_.rst
new file mode 100644
index 00000000000000..93b62d1822b723
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2024-03-06-11-00-36.gh-issue-116307.Uij0t_.rst
@@ -0,0 +1,2 @@
+Added import helper ``isolated_modules`` as ``CleanImport`` does not remove
+modules imported during the context.