[3.11] gh-112087: Fix reduce logic for the empty reverse iterator for list (gh-115472)

corona10 · web-flow · commit 1739efc57dc5 · 2024-02-14T18:43:39.000Z
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
@@ -302,7 +302,7 @@ def __eq__(self, other):
             # listiter_reduce_general
             self.assertEqual(
                 run("reversed", orig["reversed"](list(range(8)))),
-                (iter, ([],))
+                (reversed, ([],))
             )
 
             for case in types:
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-02-14-23-50-55.gh-issue-112087.H_4W_v.rst b/Misc/NEWS.d/next/Core and Builtins/2024-02-14-23-50-55.gh-issue-112087.H_4W_v.rst
@@ -0,0 +1,2 @@
+For an empty reverse iterator for list will be reduced to :func:`reversed`.
+Patch by Donghee Na.
diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -3451,36 +3451,35 @@ static PyObject *
 listiter_reduce_general(void *_it, int forward)
 {
     PyObject *list;
+    PyObject *iter;
 
     /* _PyEval_GetBuiltin can invoke arbitrary code,
      * call must be before access of iterator pointers.
      * see issue #101765 */
 
     /* the objects are not the same, index is of different types! */
     if (forward) {
-        PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));
+        iter = _PyEval_GetBuiltin(&_Py_ID(iter));
         if (!iter) {
             return NULL;
         }
         listiterobject *it = (listiterobject *)_it;
         if (it->it_seq) {
             return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index);
         }
-        Py_DECREF(iter);
     } else {
-        PyObject *reversed = _PyEval_GetBuiltin(&_Py_ID(reversed));
-        if (!reversed) {
+        iter = _PyEval_GetBuiltin(&_Py_ID(reversed));
+        if (!iter) {
             return NULL;
         }
         listreviterobject *it = (listreviterobject *)_it;
         if (it->it_seq) {
-            return Py_BuildValue("N(O)n", reversed, it->it_seq, it->it_index);
+            return Py_BuildValue("N(O)n", iter, it->it_seq, it->it_index);
         }
-        Py_DECREF(reversed);
     }
     /* empty iterator, create an empty list */
     list = PyList_New(0);
     if (list == NULL)
         return NULL;
-    return Py_BuildValue("N(N)", _PyEval_GetBuiltin(&_Py_ID(iter)), list);
+    return Py_BuildValue("N(N)", iter, list);
 }

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ def __eq__(self, other):`
`302`	`302`	`# listiter_reduce_general`
`303`	`303`	`self.assertEqual(`
`304`	`304`	`run("reversed", orig["reversed"](list(range(8)))),`
`305`		`- (iter, ([],))`
	`305`	`+ (reversed, ([],))`
`306`	`306`	`)`
`307`	`307`
`308`	`308`	`for case in types:`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+For an empty reverse iterator for list will be reduced to :func:`reversed`.
	`2`	`+Patch by Donghee Na.`