Minimal de-loop=loop-ification

required for for Python 3.10+

Author: smurfix

tests/aiotest/test_coroutine.py

@@ -16,13 +16,13 @@ class TestCoroutine(aiotest.TestCase):
     async def test_hello_world(self, loop, config):
         result = []
         coro = hello_world(config.asyncio, result, 0.001, loop)
-        await loop.run_aio_coroutine(config.asyncio.ensure_future(coro, loop=loop))
+        await loop.run_aio_coroutine(config.asyncio.ensure_future(coro))
         assert result == ['Hello', 'World']
 
     @pytest.mark.trio
     async def test_waiter(self, loop, config):
         async def waiter(asyncio, hello_world, result):
-            fut = asyncio.Future(loop=loop)
+            fut = asyncio.Future()
             loop.call_soon(fut.set_result, "Future")
 
             value = await fut

tests/interop/test_calls.py

@@ -73,7 +73,7 @@ async def call_a_ts(self, proc, *args, loop=None):
     @pytest.mark.trio
     async def test_call_at(self, loop):
         async def delay(t):
-            done = asyncio.Event(loop=loop)
+            done = asyncio.Event()
             loop.call_at(t, done.set)
             await done.wait()
 
@@ -191,13 +191,13 @@ async def test_trio_asyncio_cancel_out(self, loop):
         async def cancelled_asyncio(seen):
             seen.flag |= 1
             await asyncio.sleep(0.01)
-            f = asyncio.Future(loop=loop)
+            f = asyncio.Future()
             f.cancel()
             return f.result()  # raises error
 
         def cancelled_future(seen):
             seen.flag |= 1
-            f = asyncio.Future(loop=loop)
+            f = asyncio.Future()
             f.cancel()
             return f  # contains error
 
@@ -230,7 +230,7 @@ async def in_trio(started, seen):
                 seen.flag |= 2
 
         async def cancel_asyncio(seen):
-            started = asyncio.Event(loop=loop)
+            started = asyncio.Event()
             f = asyncio.ensure_future(self.call_a_t(in_trio, started, seen, loop=loop))
             await started.wait()
             f.cancel()
@@ -335,7 +335,7 @@ async def cancel_soon(nursery):
             await trio.sleep(0.01)
             nursery.cancel_scope.cancel()
 
-        hold = asyncio.Event(loop=loop)
+        hold = asyncio.Event()
         seen = Seen()
 
         async with trio.open_nursery() as nursery:

tests/test_aio_subprocess.py

@@ -20,12 +20,12 @@ class MySubprocessProtocol(asyncio.SubprocessProtocol):
     def __init__(self, loop):
         self.state = 'INITIAL'
         self.transport = None
-        self.connected = asyncio.Future(loop=loop)
-        self.completed = asyncio.Future(loop=loop)
-        self.disconnects = {fd: asyncio.Future(loop=loop) for fd in range(3)}
+        self.connected = asyncio.Future()
+        self.completed = asyncio.Future()
+        self.disconnects = {fd: asyncio.Future() for fd in range(3)}
         self.data = {1: b'', 2: b''}
         self.returncode = None
-        self.got_data = {1: asyncio.Event(loop=loop), 2: asyncio.Event(loop=loop)}
+        self.got_data = {1: asyncio.Event(), 2: asyncio.Event()}
 
     def connection_made(self, transport):
         self.transport = transport

trio_asyncio/_util.py

@@ -108,7 +108,7 @@ def abort_cb(raise_cancel_arg):
     try:
         while True:
             # Schedule in asyncio that we read the next item from the iterator
-            current_read = asyncio.ensure_future(consume_next(), loop=loop)
+            current_read = asyncio.ensure_future(consume_next())
 
             item = await trio.lowlevel.wait_task_rescheduled(abort_cb)