Fix resize

Author: sergey-miryanov

Lib/test/test_capi/test_tuple.py

@@ -54,7 +54,6 @@ def test_tuple_new(self):
         # Test PyTuple_New()
         tuple_new = _testlimitedcapi.tuple_new
         size = _testlimitedcapi.tuple_size
-        checknull = _testcapi._check_tuple_item_is_NULL
 
         tup1 = tuple_new(0)
         self.assertEqual(tup1, ())
@@ -66,7 +65,7 @@ def test_tuple_new(self):
         self.assertIs(type(tup2), tuple)
         self.assertEqual(size(tup2), 1)
         self.assertIsNot(tup2, tup1)
-        self.assertTrue(checknull(tup2, 0))
+        self.assertIsNone(tup2[0])
         self._tracked(tup2)
 
         self.assertRaises(SystemError, tuple_new, -1)
@@ -299,7 +298,6 @@ def test_tuple_set_item(self):
     def test__tuple_resize(self):
         # Test _PyTuple_Resize()
         resize = _testcapi._tuple_resize
-        checknull = _testcapi._check_tuple_item_is_NULL
 
         a = ()
         b = resize(a, 0, False)
@@ -308,8 +306,8 @@ def test__tuple_resize(self):
         b = resize(a, 2, False)
         self.assertEqual(len(a), 0)
         self.assertEqual(len(b), 2)
-        self.assertTrue(checknull(b, 0))
-        self.assertTrue(checknull(b, 1))
+        self.assertIsNone(b[0])
+        self.assertIsNone(b[1])
 
         a = ([1], [2], [3])
         b = resize(a, 3)
@@ -319,8 +317,8 @@ def test__tuple_resize(self):
         b = resize(a, 5)
         self.assertEqual(len(b), 5)
         self.assertEqual(b[:3], a)
-        self.assertTrue(checknull(b, 3))
-        self.assertTrue(checknull(b, 4))
+        self.assertIsNone(b[3])
+        self.assertIsNone(b[4])
 
         a = ()
         self.assertRaises(MemoryError, resize, a, PY_SSIZE_T_MAX)

Objects/tupleobject.c

@@ -1050,10 +1050,10 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
         return -1;
     }
     _Py_NewReferenceNoTotal((PyObject *) sv);
-    /* Zero out items added by growing */
-    if (newsize > oldsize)
-        memset(&sv->ob_item[oldsize], 0,
-               sizeof(*sv->ob_item) * (newsize - oldsize));
+    /* Set items added by growing to Py_None */
+    for(i = oldsize; i < newsize;i++) {
+        sv->ob_item[i] = Py_None;
+    }
     *pv = (PyObject *) sv;
     _PyObject_GC_TRACK(sv);
     return 0;