Merge branch 'main' into add_dedent

Author: terryjreedy

Doc/library/pprint.rst

@@ -22,8 +22,6 @@ The formatted representation keeps objects on a single line if it can, and
 breaks them onto multiple lines if they don't fit within the allowed width,
 adjustable by the *width* parameter defaulting to 80 characters.
 
-Dictionaries are sorted by key before the display is computed.
-
 .. versionchanged:: 3.9
    Added support for pretty-printing :class:`types.SimpleNamespace`.
 

Lib/test/test_argparse.py

@@ -5831,6 +5831,7 @@ def test_subparser_conflict(self):
 # Help and Version option tests
 # =============================
 
+@force_not_colorized_test_class
 class TestOptionalsHelpVersionActions(TestCase):
     """Test the help and version actions"""
 

Lib/test/test_free_threading/test_dbm_gnu.py

@@ -0,0 +1,79 @@
+import unittest
+
+from test.support import import_helper, os_helper, threading_helper
+from test.support.threading_helper import run_concurrently
+
+import threading
+
+gdbm = import_helper.import_module("dbm.gnu")
+
+NTHREADS = 10
+KEY_PER_THREAD = 1000
+
+gdbm_filename = "test_gdbm_file"
+
+
+@threading_helper.requires_working_threading()
+class TestGdbm(unittest.TestCase):
+    def test_racing_dbm_gnu(self):
+        def gdbm_multi_op_worker(db):
+            # Each thread sets, gets, and iterates
+            tid = threading.get_ident()
+
+            # Insert keys
+            for i in range(KEY_PER_THREAD):
+                db[f"key_{tid}_{i}"] = f"value_{tid}_{i}"
+
+            for i in range(KEY_PER_THREAD):
+                # Keys and values are stored as bytes; encode values for
+                # comparison
+                key = f"key_{tid}_{i}"
+                value = f"value_{tid}_{i}".encode()
+                self.assertIn(key, db)
+                self.assertEqual(db[key], value)
+                self.assertEqual(db.get(key), value)
+                self.assertIsNone(db.get("not_exist"))
+                with self.assertRaises(KeyError):
+                    db["not_exist"]
+
+            # Iterate over the database keys and verify only those belonging
+            # to this thread. Other threads may concurrently delete their keys.
+            key_prefix = f"key_{tid}".encode()
+            key = db.firstkey()
+            key_count = 0
+            while key:
+                if key.startswith(key_prefix):
+                    self.assertIn(key, db)
+                    key_count += 1
+                key = db.nextkey(key)
+
+            # Can't assert key_count == KEY_PER_THREAD because concurrent
+            # threads may insert or delete keys during iteration. This can
+            # cause keys to be skipped or counted multiple times, making the
+            # count unreliable.
+            # See: https://www.gnu.org.ua/software/gdbm/manual/Sequential.html
+            # self.assertEqual(key_count, KEY_PER_THREAD)
+
+            # Delete this thread's keys
+            for i in range(KEY_PER_THREAD):
+                key = f"key_{tid}_{i}"
+                del db[key]
+                self.assertNotIn(key, db)
+                with self.assertRaises(KeyError):
+                    del db["not_exist"]
+
+            # Re-insert keys
+            for i in range(KEY_PER_THREAD):
+                db[f"key_{tid}_{i}"] = f"value_{tid}_{i}"
+
+        with os_helper.temp_dir() as tmpdirname:
+            db = gdbm.open(f"{tmpdirname}/{gdbm_filename}", "c")
+            run_concurrently(
+                worker_func=gdbm_multi_op_worker, nthreads=NTHREADS, args=(db,)
+            )
+            self.assertEqual(len(db), NTHREADS * KEY_PER_THREAD)
+            db.close()
+
+
+if __name__ == "__main__":
+    unittest.main()

Misc/NEWS.d/next/Core_and_Builtins/2025-10-12-11-00-06.gh-issue-139988.4wi51t.rst

@@ -0,0 +1,2 @@
+Fix a memory leak when failing to create a :class:`~typing.Union` type.
+Patch by Bénédikt Tran.

Objects/unionobject.c

@@ -474,11 +474,13 @@ _Py_union_from_tuple(PyObject *args)
     }
     if (PyTuple_CheckExact(args)) {
         if (!unionbuilder_add_tuple(&ub, args)) {
+            unionbuilder_finalize(&ub);
             return NULL;
         }
     }
     else {
         if (!unionbuilder_add_single(&ub, args)) {
+            unionbuilder_finalize(&ub);
             return NULL;
         }
     }