Merge pull request #99 from niklasf/get-running-loop

Fix asyncio.get_running_loop() monkey-patching (#83)

newsfragments/99.bugfix.rst

@@ -0,0 +1,2 @@
+:func:`asyncio.get_running_loop()` will now return the trio-asyncio event loop
+(if running), instead of failing with :exc:`RuntimeError`.

tests/test_trio_asyncio.py

@@ -36,3 +36,14 @@ async def test_half_fixtured_asyncpg_conn(asyncio_fixture_own_loop):
 @pytest.mark.trio
 async def test_fixtured_asyncpg_conn(asyncio_fixture_with_fixtured_loop):
     await use_asyncio()
+
+
+@pytest.mark.trio
+async def test_get_running_loop():
+    async with trio_asyncio.open_loop() as loop:
+        try:
+            from asyncio import get_running_loop
+        except ImportError:
+            pass  # Python 3.6
+        else:
+            assert get_running_loop() == loop

trio_asyncio/_loop.py

@@ -251,6 +251,8 @@ def _new_run_get_or_throw():
 
     _aio_event._get_running_loop = _new_run_get
     _aio_event.get_running_loop = _new_run_get_or_throw
+    asyncio._get_running_loop = _new_run_get
+    asyncio.get_running_loop = _new_run_get_or_throw
 
 #####