Review addressed

Author: efimov-mikhail

Lib/test/test_builtin.py

@@ -1385,6 +1385,21 @@ def test_map_strict(self):
         self.assertRaises(ValueError, tuple,
                           map(pack, (1, 2), (1, 2), 'abc', strict=True))
 
+        t1 = (None, object())
+        t2 = (object(), object())
+        t3 = (object(),)
+
+        self.assertRaises(ValueError, tuple,
+                          map(pack, t1, 'a', strict=True))
+        self.assertRaises(ValueError, tuple,
+                          map(pack, t1, t2, 'a', strict=True))
+        self.assertRaises(ValueError, tuple,
+                          map(pack, t1, t2, t3, strict=True))
+        self.assertRaises(ValueError, tuple,
+                          map(pack, 'a', t1, strict=True))
+        self.assertRaises(ValueError, tuple,
+                          map(pack, 'a', t2, t3, strict=True))
+
     def test_map_strict_iterators(self):
         x = iter(range(5))
         y = [0]
@@ -1457,23 +1472,6 @@ def __next__(self):
         l8 = self.iter_error(map(pack, Iter(3), "AB", strict=True), ValueError)
         self.assertEqual(l8, [(2, "A"), (1, "B")])
 
-    # gh-140517: fix refcount leak
-    def test_map_strict_noleak(self):
-        t1 = (None, object())
-        t2 = (object(), object())
-        t3 = (object(),)
-
-        self.assertRaises(ValueError, tuple,
-                          map(pack, t1, 'a', strict=True))
-        self.assertRaises(ValueError, tuple,
-                          map(pack, t1, t2, 'a', strict=True))
-        self.assertRaises(ValueError, tuple,
-                          map(pack, t1, t2, t3, strict=True))
-        self.assertRaises(ValueError, tuple,
-                          map(pack, 'a', t1, strict=True))
-        self.assertRaises(ValueError, tuple,
-                          map(pack, 'a', t2, t3, strict=True))
-
     def test_max(self):
         self.assertEqual(max('123123'), '3')
         self.assertEqual(max(1, 2, 3), 3)

Python/bltinmodule.c

@@ -1521,7 +1521,7 @@ map_next(PyObject *self)
     if (PyErr_Occurred()) {
         if (!PyErr_ExceptionMatches(PyExc_StopIteration)) {
             // next() on argument i raised an exception (not StopIteration)
-            // result is NULL;
+            assert(result == NULL);
             goto exit;
         }
         PyErr_Clear();
@@ -1549,14 +1549,16 @@ map_next(PyObject *self)
         if (PyErr_Occurred()) {
             if (!PyErr_ExceptionMatches(PyExc_StopIteration)) {
                 // next() on argument i raised an exception (not StopIteration)
-                // result is NULL;
+                assert(result == NULL);
                 goto exit;
             }
             PyErr_Clear();
         }
         // Argument i is exhausted. So far so good...
     }
     // All arguments are exhausted. Success!
+    assert(result == NULL);
+
 exit:
     for (i=0; i < nargs; i++) {
         Py_DECREF(stack[i]);