gh-111495: Add tests for PyTuple C API

Lib/test/test_capi/test_hash.py

@@ -77,3 +77,7 @@ def python_hash_pointer(x):
         # Py_HashPointer((void*)(uintptr_t)-1) doesn't return -1 but -2
         VOID_P_MAX = -1 & (2 ** (8 * SIZEOF_VOID_P) - 1)
         self.assertEqual(hash_pointer(VOID_P_MAX), -2)
+
+
+if __name__ == "__main__":
+    unittest.main()

Lib/test/test_capi/test_list.py

@@ -347,3 +347,7 @@ def test_list_extend(self):
 
         # CRASHES list_extend(NULL, [])
         # CRASHES list_extend([], NULL)
+
+
+if __name__ == "__main__":
+    unittest.main()

Lib/test/test_capi/test_set.py

@@ -265,3 +265,7 @@ def test_set_next_entry(self):
         with self.assertRaises(SystemError):
             set_next(object(), 0)
         # CRASHES: set_next(NULL, 0)
+
+
+if __name__ == "__main__":
+    unittest.main()

Lib/test/test_capi/test_time.py

@@ -72,3 +72,7 @@ def test_time(self):
         # Test PyTime_Time() and PyTime_TimeRaw()
         self.check_clock(_testcapi.PyTime_Time, time.time)
         self.check_clock(_testcapi.PyTime_TimeRaw, time.time)
+
+
+if __name__ == "__main__":
+    unittest.main()

Lib/test/test_capi/test_tuple.py

@@ -68,6 +68,7 @@ def test_tuple_pack(self):
         self.assertEqual(pack(0), ())
         self.assertEqual(pack(1, 1), (1,))
         self.assertEqual(pack(2, 1, 2), (1, 2))
+        self.assertEqual(pack(2, [1], 2), ([1], 2))
 
         self.assertRaises(SystemError, pack, PY_SSIZE_T_MIN)
         self.assertRaises(SystemError, pack, -1)
@@ -105,8 +106,9 @@ def test_tuple_getitem(self):
         self.assertEqual(getitem(tup, 0), 1)
         self.assertEqual(getitem(tup, 2), 3)
 
-        tup = (1, 2, 3)
+        tup = (1, [2], 3)
         self.assertEqual(getitem(tup, 0), 1)
+        self.assertEqual(getitem(tup, 1), [2])
         self.assertEqual(getitem(tup, 2), 3)
 
         self.assertRaises(IndexError, getitem, tup, PY_SSIZE_T_MIN)
@@ -126,8 +128,9 @@ def test_tuple_get_item(self):
         self.assertEqual(get_item(tup, 0), 1)
         self.assertEqual(get_item(tup, 2), 3)
 
-        tup = (1, 2, 3)
+        tup = (1, [2], 3)
         self.assertEqual(get_item(tup, 0), 1)
+        self.assertEqual(get_item(tup, 1), [2])
         self.assertEqual(get_item(tup, 2), 3)
 
     def test_tuple_getslice(self):
@@ -149,33 +152,41 @@ def test_tuple_getslice(self):
         self.assertEqual(getslice(tup, 3, 0), ())
 
         # slice
-        tup = (1, 2, 3)
-        self.assertEqual(getslice(tup, 1, 3), (2, 3))
-        tup = TupleSubclass((1, 2, 3))
-        self.assertEqual(getslice(tup, 1, 3), (2, 3))
+        tup = (1, [2], 3)
+        self.assertEqual(getslice(tup, 1, 3), ([2], 3))
+        tup = TupleSubclass((1, [2], 3))
+        self.assertEqual(getslice(tup, 1, 3), ([2], 3))
 
         # whole
-        tup = (1, 2, 3)
+        tup = (1, [2], 3)
         self.assertEqual(getslice(tup, 0, 3), tup)
         self.assertEqual(getslice(tup, 0, 100), tup)
         self.assertEqual(getslice(tup, -100, 100), tup)
-        tup = TupleSubclass((1, 2, 3))
+        tup = TupleSubclass((1, [2], 3))
         self.assertEqual(getslice(tup, 0, 3), tup)
         self.assertEqual(getslice(tup, 0, 100), tup)
         self.assertEqual(getslice(tup, -100, 100), tup)
 
-        self.assertRaises(SystemError, getslice, [1, 2, 3], 0, 1)
+        self.assertRaises(SystemError, getslice, [1, [2], 3], 0, 1)
         self.assertRaises(SystemError, getslice, 42, 0, 1)
 
         # CRASHES getslice(NULL, 0, 0)
 
     def test_tuple_setitem(self):
         # Test PyTuple_SetItem()
+
+        import_helper.import_module('ctypes')
+        from ctypes import pythonapi, py_object, c_ssize_t
+
         setitem = _testlimitedcapi.tuple_setitem
 
-        tup = (0, 0)
-        self.assertEqual(setitem(tup, 0, 1), (1, 0))
-        self.assertEqual(setitem(tup, 1, 1), (0, 1))
+        tup = (0, [0])
+        self.assertEqual(setitem(tup, 0, [1]), ([1], [0]))
+        self.assertEqual(setitem(tup, 1, [1]), (0, [1]))
+        tup = setitem(tup, 1, NULL)
+        func = getattr(pythonapi, "PyTuple_GetItem")
+        func.argtypes = (py_object, c_ssize_t)
+        self.assertEqual(func(tup, 1), 0)
 
         self.assertRaises(IndexError, setitem, tup, PY_SSIZE_T_MIN, 1)
         self.assertRaises(IndexError, setitem, tup, -1, 1)
@@ -188,11 +199,19 @@ def test_tuple_setitem(self):
 
     def test_tuple_set_item(self):
         # Test PyTuple_SET_ITEM()
+
+        import_helper.import_module('ctypes')
+        from ctypes import pythonapi, py_object, c_ssize_t
+
         set_item = _testcapi.tuple_set_item
 
-        tup = (0, 0)
-        self.assertEqual(set_item(tup, 0, 1), (1, 0))
-        self.assertEqual(set_item(tup, 1, 1), (0, 1))
+        tup = (0, [0])
+        self.assertEqual(set_item(tup, 0, [1]), ([1], [0]))
+        self.assertEqual(set_item(tup, 1, [1]), (0, [1]))
+        tup = set_item(tup, 1, NULL)
+        func = getattr(pythonapi, "PyTuple_GetItem")
+        func.argtypes = (py_object, c_ssize_t)
+        self.assertEqual(func(tup, 1), 0)
 
     def test_tuple_resize(self):
         # Test PyTuple_Resize()
@@ -204,7 +223,7 @@ def test_tuple_resize(self):
         b = resize(a, 2)
         self.assertEqual(len(b), 2)
 
-        a = (1, 2, 3)
+        a = (1, [2], 3)
         b = resize(a, 3)
         self.assertEqual(b, a)
         b = resize(a, 2)
@@ -223,3 +242,7 @@ def test_tuple_resize(self):
         # non-tuple
         a = [1, 2, 3]
         self.assertRaises(SystemError, resize, a, 2)
+
+
+if __name__ == "__main__":
+    unittest.main()

Modules/_testcapi/tuple.c

@@ -44,7 +44,9 @@ tuple_set_item(PyObject *Py_UNUSED(module), PyObject *args)
         NULLABLE(obj);
         newtuple = obj;
     }
+    PyObject *val = PyTuple_GET_ITEM(newtuple, i);
     PyTuple_SET_ITEM(newtuple, i, Py_XNewRef(value));
+    Py_DECREF(val);
     return newtuple;
 }
 

Modules/_testlimitedcapi/tuple.c

@@ -89,7 +89,10 @@ tuple_setitem(PyObject *Py_UNUSED(module), PyObject *args)
             return NULL;
         }
         for (Py_ssize_t n = 0; n < size; n++) {
-            PyTuple_SetItem(newtuple, n, Py_XNewRef(PyTuple_GetItem(obj, n)));
+            if (PyTuple_SetItem(newtuple, n,
+                                Py_XNewRef(PyTuple_GetItem(obj, n))) == -1) {
+                return NULL;
+            }
         }
     }
     else {