forked from goodboy/tractor
1
0
Fork 0

Don't handle `GeneratorExit` on `asyncio` tasks

aio_explicit_task_cancels
Tyler Goodlet 2022-03-07 16:25:48 -05:00
parent 9b77b8c9ee
commit 46963c2e63
1 changed files with 5 additions and 1 deletions

View File

@ -109,6 +109,7 @@ def _run_asyncio_task(
or stream the result back to ``trio``. or stream the result back to ``trio``.
''' '''
__tracebackhide__ = True
if not current_actor().is_infected_aio(): if not current_actor().is_infected_aio():
raise RuntimeError("`infect_asyncio` mode is not enabled!?") raise RuntimeError("`infect_asyncio` mode is not enabled!?")
@ -167,6 +168,9 @@ def _run_asyncio_task(
orig = result = id(coro) orig = result = id(coro)
try: try:
result = await coro result = await coro
except GeneratorExit:
# no need to relay error
raise
except BaseException as aio_err: except BaseException as aio_err:
chan._aio_err = aio_err chan._aio_err = aio_err
raise raise
@ -295,7 +299,7 @@ async def translate_aio_errors(
): ):
# relay cancel through to called ``asyncio`` task # relay cancel through to called ``asyncio`` task
chan._aio_task.cancel( chan._aio_task.cancel(
msg=f'the `trio` caller task was cancelled:\n{trio_task.name}' msg=f'the `trio` caller task was cancelled: {trio_task.name}'
) )
raise raise