Restore basic 3.5 compatibility (for now)

Author: smurfix

tests/conftest.py

@@ -9,6 +9,7 @@
 import trio_asyncio
 import trio_asyncio.loop as loop_
 import inspect
+from async_generator import async_generator, yield_
 
 # Hacks for <3.7
 if not hasattr(asyncio, 'run'):
@@ -51,10 +52,11 @@ def create_task(coro):
 
 
 @pytest.fixture
+@async_generator
 async def loop():
     async with trio_asyncio.open_loop() as loop:
         try:
-            yield loop
+            await yield_( loop)
         finally:
             await loop.stop().wait()
 

trio_asyncio/base.py

@@ -9,6 +9,7 @@
 import warnings
 from contextvars import ContextVar
 from async_generator import asynccontextmanager
+from async_generator import async_generator, yield_
 
 from .handles import Handle, TimerHandle
 
@@ -252,12 +253,13 @@ def run_iterator(self, aiter):
         return run_generator(self, aiter)
 
     @asynccontextmanager
+    @async_generator
     async def wrap_trio_context(self, ctx):
         """Run a Trio context manager from asyncio.
         """
         res = await self.run_trio(ctx.__aenter__)
         try:
-            yield res
+            await yield_(res)
         except BaseException as exc:
             if not await self.run_trio(ctx.__aexit__, type(exc), exc, exc.__traceback__):
                 raise