Skip to content
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

GH-100112: avoid using iterable coroutines in asyncio internally #100128

Merged
merged 5 commits into from
Mar 16, 2023
Merged

GH-100112: avoid using iterable coroutines in asyncio internally #100128

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6492e9
add wrapper
kumaraditya303 Dec 9, 2022
7fecb6f
inline it
kumaraditya303 Mar 10, 2023
89524c5
add test
kumaraditya303 Mar 10, 2023
046458f
fix tests
kumaraditya303 Mar 10, 2023
dddb7bd
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 10, 2023
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
add test
  • Loading branch information
@kumaraditya303
kumaraditya303 committed Mar 10, 2023
commit 89524c5ba1115f20411563d1c59e255385dc7c7e
6 changes: 3 additions & 3 deletions Lib/asyncio/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,13 +637,13 @@ def ensure_future(coro_or_future, *, loop=None):
should_close = False
if not coroutines.iscoroutine(coro_or_future):
if inspect.isawaitable(coro_or_future):
async def _wrap_awaitable():
async def _wrap_awaitable(awaitable):
@types.coroutine
def wrapper():
return (yield from coro_or_future.__await__())
return (yield from awaitable.__await__())
return await wrapper()

coro_or_future = _wrap_awaitable()
coro_or_future = _wrap_awaitable(coro_or_future)
should_close = True
else:
raise TypeError('An asyncio.Future, a coroutine or an awaitable '
Expand Down
15 changes: 15 additions & 0 deletions Lib/test/test_asyncio/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import re
import sys
import traceback
import types
import unittest
from unittest import mock
from types import GenericAlias
Expand Down Expand Up @@ -274,6 +275,20 @@ async def coro():
loop.run_until_complete(fut)
self.assertEqual(fut.result(), 'ok')

def test_ensure_future_task_awaitable(self):
class Aw:
def __await__(self):
return asyncio.sleep(0, result='ok').__await__()

loop = asyncio.new_event_loop()
self.set_event_loop(loop)
task = asyncio.ensure_future(Aw(), loop=loop)
loop.run_until_complete(task)
self.assertTrue(task.done())
self.assertEqual(task.result(), 'ok')
self.assertIsInstance(task.get_coro(), types.CoroutineType)
loop.close()

def test_ensure_future_neither(self):
with self.assertRaises(TypeError):
asyncio.ensure_future('ok')
Expand Down