[3.13] GH-127682: Backport GH-132351 (GH-132384)

Only call `__iter__` once in generator expressions

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 73807d7fa95fbdcde04f8018788cba1190637c11..51e00418165467239ae47cd3783e6b739c060805 100644 (file)
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -184,7 +184,6 @@ dis_bug1333982 = """\
               LOAD_CONST               1 (<code object <genexpr> at 0x..., file "%s", line %d>)
               MAKE_FUNCTION
               LOAD_FAST                0 (x)
-              GET_ITER
               CALL                     0
 
 %3d           LOAD_CONST               2 (1)
@@ -765,7 +764,6 @@ Disassembly of <code object foo at 0x..., file "%s", line %d>:
                MAKE_FUNCTION
                SET_FUNCTION_ATTRIBUTE   8 (closure)
                LOAD_DEREF               1 (y)
-               GET_ITER
                CALL                     0
                CALL                     1
                RETURN_VALUE

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 515fe7407f1d80e50523964cfc8822c1f9d9e587..a6c1dd62a23cc3f0869e97d1d40a6d338e33a148 100644 (file)
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -246,6 +246,28 @@ class GeneratorTest(unittest.TestCase):
         #This should not raise
         loop()
 
+    def test_genexpr_only_calls_dunder_iter_once(self):
+
+        class Iterator:
+
+            def __init__(self):
+                self.val = 0
+
+            def __next__(self):
+                if self.val == 2:
+                    raise StopIteration
+                self.val += 1
+                return self.val
+
+            # No __iter__ method
+
+        class C:
+
+            def __iter__(self):
+                return Iterator()
+
+        self.assertEqual([1,2], list(i for i in C()))
+
 
 class ModifyUnderlyingIterableTest(unittest.TestCase):
     iterables = [

diff --git a/Lib/test/test_genexps.py b/Lib/test/test_genexps.py
index 4f2d3cdcc7943eaebe7698ca556164a941142019..bb241837bd6679c1e84f289eeaa8cd958f04ae8b 100644 (file)
--- a/Lib/test/test_genexps.py
+++ b/Lib/test/test_genexps.py
@@ -123,15 +123,6 @@ Verify early binding for the outermost for-expression
     >>> list(g)
     [0, 1, 4, 9, 16, 25, 36, 49, 64, 81]
 
-Verify that the outermost for-expression makes an immediate check
-for iterability
-
-    >>> (i for i in 6)
-    Traceback (most recent call last):
-      File "<pyshell#4>", line 1, in -toplevel-
-        (i for i in 6)
-    TypeError: 'int' object is not iterable
-
 Verify late binding for the outermost if-expression
 
     >>> include = (2,4,6,8)

diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-04-10-10-29-45.gh-issue-127682.X0HoGz.rst b/Misc/NEWS.d/next/Core and Builtins/2025-04-10-10-29-45.gh-issue-127682.X0HoGz.rst
new file mode 100644 (file)
index 0000000..b87750e
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2025-04-10-10-29-45.gh-issue-127682.X0HoGz.rst
@@ -0,0 +1,4 @@
+No longer call ``__iter__`` twice when creating and executing a generator expression.
+Creating a generator expression from a non-interable will raise only when the
+generator expression is executed.
+This brings the behavior of generator expressions in line with other generators.

diff --git a/Python/compile.c b/Python/compile.c
index bb2c2293a38c9a3fe291c96b32062f201f64180e..e8d19d2dc42744d6dbc869adca98e695d8d90343 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -5910,9 +5910,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
     }
     Py_CLEAR(co);
 
-    if (compiler_comprehension_iter(c, outermost)) {
-        goto error;
-    }
+    VISIT(c, expr, outermost->iter);
 
     ADDOP_I(c, loc, CALL, 0);