forked from goodboy/tractor
1
0
Fork 0

Drop cancel scope from linked task channel

infect_asyncio
Tyler Goodlet 2021-11-24 20:08:06 -05:00
parent c4b3bb354e
commit b69412a903
1 changed files with 3 additions and 6 deletions

View File

@ -167,7 +167,6 @@ async def translate_aio_errors(
from_aio: trio.MemoryReceiveChannel, from_aio: trio.MemoryReceiveChannel,
task: asyncio.Task, task: asyncio.Task,
trio_cs: trio.CancelScope,
) -> None: ) -> None:
''' '''
@ -242,7 +241,7 @@ async def run_task(
) )
with from_aio: with from_aio:
# try: # try:
async with translate_aio_errors(from_aio, task, cs): async with translate_aio_errors(from_aio, task):
# return single value that is the output from the # return single value that is the output from the
# ``asyncio`` function-as-task. Expect the mem chan api to # ``asyncio`` function-as-task. Expect the mem chan api to
# do the job of handling cross-framework cancellations # do the job of handling cross-framework cancellations
@ -263,7 +262,6 @@ class LinkedTaskChannel(trio.abc.Channel):
_to_aio: asyncio.Queue _to_aio: asyncio.Queue
_from_aio: trio.MemoryReceiveChannel _from_aio: trio.MemoryReceiveChannel
_aio_task_complete: trio.Event _aio_task_complete: trio.Event
_trio_cs: trio.CancelScope
async def aclose(self) -> None: async def aclose(self) -> None:
self._from_aio.close() self._from_aio.close()
@ -272,7 +270,6 @@ class LinkedTaskChannel(trio.abc.Channel):
async with translate_aio_errors( async with translate_aio_errors(
self._from_aio, self._from_aio,
self._aio_task, self._aio_task,
self._trio_cs,
): ):
return await self._from_aio.receive() return await self._from_aio.receive()
@ -312,10 +309,10 @@ async def open_channel_from(
) )
chan = LinkedTaskChannel( chan = LinkedTaskChannel(
task, aio_q, from_aio, task, aio_q, from_aio,
aio_task_complete, cs aio_task_complete
) )
async with from_aio: async with from_aio:
async with translate_aio_errors(from_aio, task, cs): async with translate_aio_errors(from_aio, task):
# sync to a "started()"-like first delivered value from the # sync to a "started()"-like first delivered value from the
# ``asyncio`` task. # ``asyncio`` task.
first = await from_aio.receive() first = await from_aio.receive()