From 326b258fd56c2468464b3173b3cac12b2d3f9cc0 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Fri, 25 Jul 2025 11:16:02 -0400 Subject: [PATCH] Drop `tn` input from `maybe_raise_from_masking_exc()` Including all caller usage throughout. Moving to a non-`except*` impl means it's never needed as a signal from the caller - we can just catch the beg outright (like we should have always been doing).. --- tests/test_trioisms.py | 1 - tractor/_rpc.py | 1 - tractor/trionics/_taskc.py | 1 - 3 files changed, 3 deletions(-) diff --git a/tests/test_trioisms.py b/tests/test_trioisms.py index 7f6caa6e..e6c42c01 100644 --- a/tests/test_trioisms.py +++ b/tests/test_trioisms.py @@ -117,7 +117,6 @@ def test_acm_embedded_nursery_propagates_enter_err( async with ( trio.open_nursery() as tn, tractor.trionics.maybe_raise_from_masking_exc( - tn=tn, unmask_from=( (trio.Cancelled,) if unmask_from_canc else () diff --git a/tractor/_rpc.py b/tractor/_rpc.py index 0be4e6a9..023bae17 100644 --- a/tractor/_rpc.py +++ b/tractor/_rpc.py @@ -673,7 +673,6 @@ async def _invoke( # scope ensures unasking of the `await coro` below # *should* never be interfered with!! maybe_raise_from_masking_exc( - tn=tn, unmask_from=(Cancelled,), ) as _mbme, # maybe boxed masked exc ): diff --git a/tractor/trionics/_taskc.py b/tractor/trionics/_taskc.py index fb743bbc..4e336b59 100644 --- a/tractor/trionics/_taskc.py +++ b/tractor/trionics/_taskc.py @@ -65,7 +65,6 @@ def find_masked_excs( # @acm async def maybe_raise_from_masking_exc( - tn: trio.Nursery|None = None, unmask_from: ( BaseException| tuple[BaseException]