From ad9256bcdbdfb9979e867a5cebba65186e3e1cd9 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Wed, 28 Apr 2021 11:38:10 -0400 Subject: [PATCH] Drop stream exhaustion; no longer needed --- tractor/_spawn.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tractor/_spawn.py b/tractor/_spawn.py index f8528ace..a07f60c7 100644 --- a/tractor/_spawn.py +++ b/tractor/_spawn.py @@ -98,17 +98,11 @@ async def exhaust_portal( """ try: log.debug(f"Waiting on final result from {actor.uid}") - final = res = await portal.result() - # if it's an async-gen then alert that we're cancelling it - if inspect.isasyncgen(res): - final = [] - log.warning( - f"Blindly consuming asyncgen for {actor.uid}") - with trio.fail_after(1): - async with aclosing(res) as agen: - async for item in agen: - log.debug(f"Consuming item {item}") - final.append(item) + + # XXX: streams should never be reaped here since they should + # always be established and shutdown using a context manager api + final = await portal.result() + except (Exception, trio.MultiError) as err: # we reraise in the parent task via a ``trio.MultiError`` return err