From: Dong-hee Na <donghee.na@python.org>
Date: Fri, 17 Feb 2023 15:18:47 +0000 (+0900)
Subject: gh-101766: Fix refleak for _BlockingOnManager resources from test suite level (gh... 
X-Git-Tag: v3.12.0a6~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f482ade4c7887c49dfd8bba3be76f839e562608d;p=thirdparty%2FPython%2Fcpython.git

gh-101766: Fix refleak for _BlockingOnManager resources from test suite level (gh-101988)
---

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 1ef7b6adb044..bebe7e15cbce 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -85,11 +85,6 @@ class _BlockingOnManager:
     def __exit__(self, *args, **kwargs):
         """Remove self.lock from this thread's _blocking_on list."""
         self.blocked_on.remove(self.lock)
-        if len(self.blocked_on) == 0:
-            # gh-101766: glboal cache should be cleaned-up
-            # if there is no more _blocking_on for this thread.
-            del _blocking_on[self.thread_id]
-            del self.blocked_on
 
 
 class _DeadlockError(RuntimeError):
diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py
index 56d73c496e6b..ba9cf51c261d 100644
--- a/Lib/test/test_importlib/test_locks.py
+++ b/Lib/test/test_importlib/test_locks.py
@@ -33,6 +33,11 @@ class ModuleLockAsRLockTests:
     test_repr = None
     test_locked_repr = None
 
+    def tearDown(self):
+        for splitinit in init.values():
+            splitinit._bootstrap._blocking_on.clear()
+
+
 LOCK_TYPES = {kind: splitinit._bootstrap._ModuleLock
               for kind, splitinit in init.items()}