Convert async fns to coroutines

Author: absurdfarce

cassandra/io/asyncioreactor.py

@@ -10,13 +10,6 @@
 
 log = logging.getLogger(__name__)
 
-
-# This module uses ``yield from`` and ``@asyncio.coroutine`` over ``await`` and
-# ``async def`` for pre-Python-3.5 compatibility, so keep in mind that the
-# managed coroutines are generator-based, not native coroutines. See PEP 492:
-# https://www.python.org/dev/peps/pep-0492/#coroutine-objects
-
-
 try:
     asyncio.run_coroutine_threadsafe
 except AttributeError:
@@ -40,9 +33,10 @@ def end(self):
                                   'does not implement .end()')
 
     def __init__(self, timeout, callback, loop):
-        delayed = self._call_delayed_coro(timeout=timeout,
+        delayed = asyncio.wait_for(self._call_delayed_coro(timeout=timeout,
                                           callback=callback,
-                                          loop=loop)
+                                          loop=loop),
+                                    timeout=None)
         self._handle = asyncio.run_coroutine_threadsafe(delayed, loop=loop)
 
     @staticmethod
@@ -96,10 +90,10 @@ def __init__(self, *args, **kwargs):
         # see initialize_reactor -- loop is running in a separate thread, so we
         # have to use a threadsafe call
         self._read_watcher = asyncio.run_coroutine_threadsafe(
-            self.handle_read(), loop=self._loop
+            asyncio.wait_for(self.handle_read(), timeout=None), loop=self._loop
         )
         self._write_watcher = asyncio.run_coroutine_threadsafe(
-            self.handle_write(), loop=self._loop
+            asyncio.wait_for(self.handle_write(), timeout=None), loop=self._loop
         )
         self._send_options_message()
 
@@ -132,7 +126,7 @@ def close(self):
         # close from the loop thread to avoid races when removing file
         # descriptors
         asyncio.run_coroutine_threadsafe(
-            self._close(), loop=self._loop
+            asyncio.wait_for(self._close(), timeout=None), loop=self._loop
         )
 
     async def _close(self):
@@ -165,7 +159,7 @@ def push(self, data):
 
         if self._loop_thread.ident != get_ident():
             asyncio.run_coroutine_threadsafe(
-                self._push_msg(chunks),
+                asyncio.wait_for(self._push_msg(chunks), timeout=None),
                 loop=self._loop
             )
         else: