Use Trio's new CancelScope API

Author: Zac-HD

pytest_trio/_tests/test_fixture_ordering.py

@@ -171,7 +171,7 @@ async def crash_late_agen():
             raise RuntimeError("crash_late_agen".upper())
 
         async def crash(when, token):
-            with trio.open_cancel_scope(shield=True):
+            with trio.CancelScope(shield=True):
                 await trio.sleep(when)
                 raise RuntimeError(token.upper())
 

pytest_trio/plugin.py

@@ -235,7 +235,7 @@ async def run(self, test_ctx, contextvars_ctx):
                 # should cancel them.
                 assert not self.user_done_events
                 func_value = None
-                with trio.open_cancel_scope() as cancel_scope:
+                with trio.CancelScope() as cancel_scope:
                     test_ctx.test_cancel_scope = cancel_scope
                     assert not test_ctx.crashed
                     await self._func(**resolved_kwargs)
@@ -280,7 +280,7 @@ async def run(self, test_ctx, contextvars_ctx):
             except BaseException as exc:
                 assert isinstance(exc, trio.Cancelled)
                 test_ctx.crash(None)
-                with trio.open_cancel_scope(shield=True):
+                with trio.CancelScope(shield=True):
                     for event in self.user_done_events:
                         await event.wait()