8000 bpo-43751: Fix anext() bug where it erroneously returned None by sweeneyde · Pull Request #25238 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-43751: Fix anext() bug where it erroneously returned None #25238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Apr 11, 2021
Merged

bpo-43751: Fix anext() bug where it erroneously returned None #25238

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
065331f
Add another test for anext
sweeneyde Apr 6, 2021
ddeac2d
Fix anext(ait, default) returning None
sweeneyde Apr 6, 2021
134449b
Add null check for getter
sweeneyde Apr 7, 2021
bfd57ad
Test anext() on generator and python-implemented async iterator class
sweeneyde Apr 7, 2021
d8c56ff
fix whitespace
sweeneyde Apr 7, 2021
ab54ece
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 7, 2021
056d9c6
Explicity call am_await() when applicable.
sweeneyde Apr 7, 2021
58a56fb
Refactor tests
sweeneyde Apr 8, 2021
a113e19
Add test for async generator with __anext__ = types.coroutine(...)
sweeneyde Apr 8, 2021
4039170
Update Objects/iterobject.c
sweeneyde Apr 9, 2021
0130217
fix minor issues; add a test case for bad awaitables
sweeneyde Apr 10, 2021
665f84c
merge with github
sweeneyde Apr 10, 2021
5607d83
Add more tests for corner cases
sweeneyde Apr 10, 2021
11fe9c2
make the corner-case tests pass
sweeneyde Apr 10, 2021
6a6fa66
Add null check for new_awaitable; remove null check for am_await beca…
sweeneyde Apr 11, 2021
857a2b0
Avoid leaking awaitable
sweeneyde Apr 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor tests
  • Loading branch information
@sweeneyde
sweeneyde committed Apr 8, 2021
commit 58a56fb223d17686223ec5aa24eb6a54a22791a1
71 changes: 37 additions & 34 deletions Lib/test/test_asyncgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,46 @@ def tearDown(self):
self.loop = None
asyncio.set_event_loop_policy(None)

def test_async_gen_anext(self):
def check_async_iterator_anext(self, ait_class):
g = ait_class()
async def consume():
results = []
results.append(await anext(g))
results.append(await anext(g))
results.append(await anext(g, 'buckle my shoe'))
return results
res = self.loop.run_until_complete(consume())
self.assertEqual(res, [1, 2, 'buckle my shoe'])
with self.assertRaises(StopAsyncIteration):
self.loop.run_until_complete(consume())

async def test_2():
g1 = ait_class()
self.assertEqual(await anext(g1), 1)
self.assertEqual(await anext(g1), 2)
with self.assertRaises(StopAsyncIteration):
await anext(g1)
with self.assertRaises(StopAsyncIteration):
await anext(g1)

g2 = ait_class()
self.assertEqual(await anext(g2, "default"), 1)
self.assertEqual(await anext(g2, "default"), 2)
self.assertEqual(await anext(g2, "default"), "default")
self.assertEqual(await anext(g2, "default"), "default")

return "completed"

result = self.loop.run_until_complete(test_2())
self.assertEqual(result, "completed")

def test_async_generator_anext(self):
async def agen():
yield 1
yield 2
self.check_async_iterator_anext(agen)

def test_python_async_iterator_anext(self):
class MyAsyncIter:
"""Asynchronously yield 1, then 2."""
def __init__(self):
Expand All @@ -389,39 +424,7 @@ async def __anext__(self):
else:
self.yielded += 1
return self.yielded

for gen in (agen, MyAsyncIter):
g = gen()
async def consume():
results = []
results.append(await anext(g))
results.append(await anext(g))
results.append(await anext(g, 'buckle my shoe'))
return results
res = self.loop.run_until_complete(consume())
self.assertEqual(res, [1, 2, 'buckle my shoe'])
with self.assertRaises(StopAsyncIteration):
self.loop.run_until_complete(consume())

async def test_2():
g1 = gen()
self.assertEqual(await anext(g1), 1)
self.assertEqual(await anext(g1), 2)
with self.assertRaises(StopAsyncIteration):
await anext(g1)
with self.assertRaises(StopAsyncIteration):
await anext(g1)

g2 = gen()
self.assertEqual(await anext(g2, "default"), 1)
self.assertEqual(await anext(g2, "default"), 2)
self.assertEqual(await anext(g2, "default"), "default")
self.assertEqual(await anext(g2, "default"), "default")

return "completed"

result = self.loop.run_until_complete(test_2())
self.assertEqual(result, "completed")
self.check_async_iterator_anext(MyAsyncIter)

def test_async_gen_aiter(self):
async def gen():
Expand Down
0