2025-01-07T19:58:50Z

Author: wrmsr

omlish/asyncs/asyncio/all.py

@@ -1,7 +1,6 @@
 # ruff: noqa: I001
 from .asyncio import (  # noqa
     asyncio_once,
-    get_real_current_loop,
     drain_tasks,
     draining_asyncio_tasks,
 )

omlish/asyncs/asyncio/asyncio.py

@@ -20,21 +20,17 @@ async def inner(*args, **kwargs):
     return ta.cast(CallableT, inner)
 
 
-def get_real_current_loop() -> asyncio.AbstractEventLoop | None:
-    return asyncio.get_event_loop_policy()._local._loop  # type: ignore  # noqa
-
-
 def drain_tasks(loop=None):
     if loop is None:
-        loop = get_real_current_loop()
+        loop = asyncio.get_running_loop()
 
     while loop._ready or loop._scheduled:  # noqa
         loop._run_once()  # noqa
 
 
 @contextlib.contextmanager
 def draining_asyncio_tasks() -> ta.Iterator[None]:
-    loop = get_real_current_loop()
+    loop = asyncio.get_running_loop()
     try:
         yield
     finally:

omlish/asyncs/bridge.py

@@ -86,7 +86,7 @@ class BridgeAwaitRequiredError(Exception):
     pass
 
 
-class MissingBridgeGreenletError(Exception):
+class MissingBridgeThreadletError(Exception):
     pass
 
 
@@ -224,7 +224,7 @@ def s_to_a_await(awaitable: ta.Awaitable[T]) -> T:
 
     if not getattr(g.underlying, _BRIDGE_THREADLET_ATTR, False):
         _safe_cancel_awaitable(awaitable)
-        raise MissingBridgeGreenletError
+        raise MissingBridgeThreadletError
 
     return check.not_none(g.parent).switch(awaitable)
 

omlish/asyncs/tests/test_flavors.py

@@ -7,7 +7,6 @@
 import trio
 
 from ... import lang
-from ...diag import pydevd as pdu
 from ...testing import pytest as ptu
 from .. import flavors
 
@@ -21,14 +20,6 @@
 ##
 
 
-@pytest.fixture(autouse=True)
-def _patch_for_trio_asyncio_fixture():
-    pdu.patch_for_trio_asyncio()
-
-
-##
-
-
 @flavors.mark_anyio
 async def _anyio_func(call_asyncio, call_trio):
     await anyio.sleep(0)

omlish/asyncs/tests/test_greenlet.py

@@ -36,7 +36,7 @@ def f():
 
 
 @ptu.skip.if_cant_import('greenlet')
-def test_bridge(event_loop):
+def test_bridge():
     import greenlet
 
     l = []
@@ -69,4 +69,5 @@ async def main():
         )
         assert rs == [4, 4]
 
-    event_loop.run_until_complete(main())  # noqa
+    with asyncio.Runner() as runner:
+        runner.get_loop().run_until_complete(main())  # noqa

omlish/asyncs/tests/test_trio_asyncio.py

@@ -15,9 +15,7 @@
 import trio
 
 from ... import lang
-from ...diag import pydevd as pdu
 from ...testing import pytest as ptu
-from ..asyncio import all as asu
 
 
 if ta.TYPE_CHECKING:
@@ -26,11 +24,6 @@
     trai = lang.proxy_import('trio_asyncio')
 
 
-@pytest.fixture(autouse=True)
-def _patch_for_trio_asyncio_fixture():
-    pdu.patch_for_trio_asyncio()
-
-
 @ptu.skip.if_cant_import('trio_asyncio')
 def test_hybrid():
     async def hybrid():
@@ -179,7 +172,7 @@ async def test_all_asyncs(__async_backend):  # noqa
     match __async_backend:
         case 'asyncio':
             assert backend == 'asyncio'
-            assert asu.get_real_current_loop() is not None
+            assert asyncio.get_running_loop() is not None
             assert trai.current_loop.get() is None
             assert not isinstance(asyncio.get_running_loop(), trai.TrioEventLoop)
 
@@ -189,7 +182,8 @@ async def test_all_asyncs(__async_backend):  # noqa
 
         case 'trio':
             assert backend == 'trio'
-            assert asu.get_real_current_loop() is None
+            with pytest.raises(RuntimeError):
+                assert asyncio.get_running_loop()
             assert trai.current_loop.get() is None
 
             with pytest.raises(RuntimeError):