Merge pull request #17

Author: smurfix

setup.py

@@ -61,6 +61,7 @@
     packages=find_packages(),
     install_requires=[
         "trio",
+        "async_generator >= 1.6",
     ],
     # This means, just install *everything* you see under trio/, even if it
     # doesn't look like a source file, so long as it appears in MANIFEST.in:

trio_asyncio/adapter.py

@@ -1,7 +1,7 @@
 # This code implements a clone of the asyncio mainloop which hooks into
 # Trio.
 
-import inspect
+from async_generator import isasyncgenfunction
 import trio_asyncio
 
 # import logging
@@ -13,7 +13,7 @@
 
 
 def trio2aio(proc):
-    if inspect.isasyncgenfunction(proc):
+    if isasyncgenfunction(proc):
 
         @wraps(proc)
         def call(*args, **kwargs):

trio_asyncio/util.py

@@ -4,6 +4,7 @@
 import trio
 import asyncio
 import sys
+from async_generator import async_generator, yield_
 
 __all__ = ['run_future']
 
@@ -50,6 +51,7 @@ def abort_cb(raise_cancel_arg):
 STOP = object()
 
 
+@async_generator
 async def run_generator(loop, async_generator):
     task = trio.hazmat.current_task()
     raise_cancel = None
@@ -79,7 +81,7 @@ def abort_cb(raise_cancel_arg):
             item = await trio.hazmat.wait_task_rescheduled(abort_cb)
             if item is STOP:
                 break
-            yield item
+            await yield_(item)
 
     except asyncio.CancelledError as exc:
         if raise_cancel is not None: