]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-136517: Print uncollectable objects if DEBUG_UNCOLLECTABLE mode was set (#136518)
authorSergey Miryanov <sergey.miryanov@gmail.com>
Thu, 10 Jul 2025 21:13:23 +0000 (14:13 -0700)
committerGitHub <noreply@github.com>
Thu, 10 Jul 2025 21:13:23 +0000 (22:13 +0100)
Lib/test/test_gc.py
Misc/NEWS.d/next/Core_and_Builtins/2025-07-10-23-23-50.gh-issue-136517._NHJyv.rst [new file with mode: 0644]
Python/gc.c

index 85c43055d0dcec71694f896afb09ee09e718a465..96ebb23f73de9d7d126caf8e7c6cde138f1edaef 100644 (file)
@@ -732,6 +732,9 @@ class GCTests(unittest.TestCase):
         self.assertIn(b"ResourceWarning: gc: 2 uncollectable objects at "
                       b"shutdown; use", stderr)
         self.assertNotIn(b"<X 'first'>", stderr)
+        one_line_re = b"gc: uncollectable <X 0x[0-9A-Fa-f]+>"
+        expected_re = one_line_re + b"\r?\n" + one_line_re
+        self.assertNotRegex(stderr, expected_re)
         # With DEBUG_UNCOLLECTABLE, the garbage list gets printed
         stderr = run_command(code % "gc.DEBUG_UNCOLLECTABLE")
         self.assertIn(b"ResourceWarning: gc: 2 uncollectable objects at "
@@ -739,6 +742,8 @@ class GCTests(unittest.TestCase):
         self.assertTrue(
             (b"[<X 'first'>, <X 'second'>]" in stderr) or
             (b"[<X 'second'>, <X 'first'>]" in stderr), stderr)
+        # we expect two lines with uncollectable objects
+        self.assertRegex(stderr, expected_re)
         # With DEBUG_SAVEALL, no additional message should get printed
         # (because gc.garbage also contains normally reclaimable cyclic
         # references, and its elements get printed at runtime anyway).
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-07-10-23-23-50.gh-issue-136517._NHJyv.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-07-10-23-23-50.gh-issue-136517._NHJyv.rst
new file mode 100644 (file)
index 0000000..bf26c4e
--- /dev/null
@@ -0,0 +1,2 @@
+Fixed a typo that prevented printing of uncollectable objects when the
+:const:`gc.DEBUG_UNCOLLECTABLE` mode was set.
index 88849a43680d2e44442947dbc5cd368ece374e7a..4160f68c27a3ef7c629d3ede1069409fb9f64f2b 100644 (file)
@@ -1782,7 +1782,7 @@ gc_collect_region(PyThreadState *tstate,
     Py_ssize_t n = 0;
     for (gc = GC_NEXT(&finalizers); gc != &finalizers; gc = GC_NEXT(gc)) {
         n++;
-        if (gcstate->debug & _PyGC_DEBUG_COLLECTABLE)
+        if (gcstate->debug & _PyGC_DEBUG_UNCOLLECTABLE)
             debug_cycle("uncollectable", FROM_GC(gc));
     }
     stats->uncollectable = n;