Return Task.__await__ to avoid TypeError when loop debug is False

python/asyncio#451

Author: nocarryr

pydispatch/aioutils.py

@@ -138,7 +138,8 @@ async def wait(self):
         await self.aio_event.wait()
         return self.args, self.kwargs
     def __await__(self):
-        return self.wait()
+        task = asyncio.ensure_future(self.wait())
+        return task.__await__()
 
 class AioEventWaiters(object):
     """Container used to manage :keyword:`await` use with events
@@ -188,7 +189,8 @@ async def wait(self):
         waiter = await self.add_waiter()
         return await waiter
     def __await__(self):
-        return self.wait()
+        task = asyncio.ensure_future(self.wait())
+        return task.__await__()
     def __call__(self, *args, **kwargs):
         """Triggers any stored :class:`waiters <AioEventWaiter>`
 

tests/test_aio_listeners.py

@@ -77,6 +77,7 @@ def __init__(self, mainloop, sender):
         self.stopped = threading.Event()
     def run(self):
         loop = self.loop = asyncio.new_event_loop()
+        loop.set_debug(self.mainloop.get_debug())
         asyncio.set_event_loop(loop)
         listener = AsyncListener(loop, self.mainloop)
         sender = self.sender
@@ -95,15 +96,20 @@ def stop(self):
         self.running.clear()
         self.stopped.wait()
 
+@pytest.fixture(params=[True, False])
+def loop_debug(request):
+    return request.param
+
 @pytest.mark.asyncio
-async def test_simple(sender_cls):
+async def test_simple(sender_cls, loop_debug):
 
     class Sender(sender_cls):
         prop_a = Property()
         prop_b = Property()
         _events_ = ['on_test_a', 'on_test_b', 'on_test_c']
 
     loop = asyncio.get_event_loop()
+    loop.set_debug(loop_debug)
 
     sender = Sender()
     listener = AsyncListener(loop, loop)
@@ -131,14 +137,15 @@ class Sender(sender_cls):
             assert data['loop'] is loop
 
 @pytest.mark.asyncio
-async def test_unbind(sender_cls):
+async def test_unbind(sender_cls, loop_debug):
 
     class Sender(sender_cls):
         prop_a = Property()
         prop_b = Property()
         _events_ = ['on_test_a', 'on_test_b', 'on_test_c']
 
     loop = asyncio.get_event_loop()
+    loop.set_debug(loop_debug)
 
     sender = Sender()
     listener = AsyncListener(loop, loop)
@@ -217,7 +224,7 @@ async def check_events_unbound():
     await check_events_unbound()
 
 @pytest.mark.asyncio
-async def test_multiple_loops(sender_cls):
+async def test_multiple_loops(sender_cls, loop_debug):
 
     class Sender(sender_cls):
         prop_a = Property()
@@ -226,6 +233,7 @@ class Sender(sender_cls):
 
     sender = Sender()
     mainloop = asyncio.get_event_loop()
+    mainloop.set_debug(loop_debug)
 
     async def send_event(name, *listener_threads):
         sender.trigger_event(name)
@@ -271,15 +279,15 @@ async def trigger_prop(name, value, *listener_threads):
         t.stop()
 
 @pytest.mark.asyncio
-async def test_event_await(sender_cls):
+async def test_event_await(sender_cls, loop_debug):
 
     class Sender(sender_cls):
         prop_a = Property()
         prop_b = Property()
         _events_ = ['on_test_a', 'on_test_b', 'on_test_c']
 
     loop = asyncio.get_event_loop()
-    loop.set_debug(True)
+    loop.set_debug(loop_debug)
 
     sender = Sender()