FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

GH-127682: Only call `__iter__` once in generator expressions. by markshannon · Pull Request #132351 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (1) .py  (3) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 0 additions & 2 deletions Lib/test/test_dis.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ def bug1333982(x=[]):
LOAD_CONST 1 (<code object <genexpr> at 0x..., file "%s", line %d>)
MAKE_FUNCTION
LOAD_FAST_BORROW 0 (x)
GET_ITER
CALL 0

%3d LOAD_SMALL_INT 1
Expand Down Expand Up @@ -821,7 +820,6 @@ def foo(x):
MAKE_FUNCTION
SET_FUNCTION_ATTRIBUTE 8 (closure)
LOAD_DEREF 1 (y)
GET_ITER
CALL 0
CALL 1
RETURN_VALUE
Expand Down
22 changes: 22 additions & 0 deletions Lib/test/test_generators.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,28 @@ def loop():
#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 = [
Expand Down
9 changes: 0 additions & 9 deletions Lib/test/test_genexps.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,6 @@
>>> list(g)
[0, 1, 4, 9, 16, 25, 36, 49, 64, 81]

Verify that the outermost for-expression makes an immediate check

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This is a regression.

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)
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 1 addition & 4 deletions Python/codegen.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -4775,10 +4775,7 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
}
Py_CLEAR(co);

if (codegen_comprehension_iter(c, outermost)) {
goto error;
}

VISIT(c, expr, outermost->iter);
ADDOP_I(c, loc, CALL, 0);

if (is_async_comprehension && type != COMP_GENEXP) {
Expand Down

Back | FazBrowse Home | New Git URL