Merge pull request #41 from smurfix/master

Fix #40

Author: smurfix

newsfragments/40.bugfix.rst

@@ -0,0 +1 @@
+Defer creating an asyncio coroutine until asyncio mode is actually entered.

trio_asyncio/_version.py

@@ -1,3 +1,3 @@
 # This file is imported from __init__.py and exec'd from setup.py
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"

trio_asyncio/adapter.py

@@ -35,6 +35,10 @@ def trio2aio(proc):
     return aio_as_trio(proc)
 
 
+async def _call_defer(proc, *args, **kwargs):
+    return await proc(*args, **kwargs)
+
+
 class Asyncio_Trio_Wrapper:
     """
     This wrapper object encapsulates an asyncio-style coroutine,
@@ -66,8 +70,9 @@ async def __call__(self, *args, **kwargs):
         if self.args:
             raise RuntimeError("Call 'aio_as_trio(proc)(*args)', not 'aio_as_trio(proc, *args)'")
 
-        # TODO: do this within the loop context
-        f = self.proc(*args, **kwargs)
+        # We route this through _calL_defer because some wrappers require
+        # running in asyncio context
+        f = _call_defer(self.proc, *args, **kwargs)
         return await self.loop.run_aio_coroutine(f)
 
     def __await__(self):