From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 1 Jul 2024 09:29:23 +0000 (+0200)
Subject: [3.12] gh-121084: Call _abc_registry_clear() when checking refleaks (GH-121191) ... 
X-Git-Tag: v3.12.5~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fba86e8b8df5997291df0ee505819e05af39073;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-121084: Call _abc_registry_clear() when checking refleaks (GH-121191) (#121209)

gh-121084: Call _abc_registry_clear() when checking refleaks (GH-121191)

dash_R_cleanup() now calls _abc_registry_clear() before calling again
register().
(cherry picked from commit c766ad206ea60b1e0edcb625b99e7631954a984f)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/test/libregrtest/refleak.py b/Lib/test/libregrtest/refleak.py
index a257d1023537..568690bdec4b 100644
--- a/Lib/test/libregrtest/refleak.py
+++ b/Lib/test/libregrtest/refleak.py
@@ -239,9 +239,13 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs):
     abs_classes = filter(isabstract, abs_classes)
     for abc in abs_classes:
         for obj in abc.__subclasses__() + [abc]:
-            for ref in abcs.get(obj, set()):
-                if ref() is not None:
-                    obj.register(ref())
+            refs = abcs.get(obj, None)
+            if refs is not None:
+                obj._abc_registry_clear()
+                for ref in refs:
+                    subclass = ref()
+                    if subclass is not None:
+                        obj.register(subclass)
             obj._abc_caches_clear()
 
     # Clear caches