Backwards compatibility with Python versions that don't have asyncio.ensure_future yet. (Fallback to asyncio.async.)

jonathanslenders · jonathanslenders · commit 82bd3022dc46 · 2016-02-22T22:31:31.000+01:00
diff --git a/asyncio_redis/protocol.py b/asyncio_redis/protocol.py
@@ -58,6 +58,12 @@
 
 NoneType = type(None)
 
+# In Python 3.4.4, `async` was renamed to `ensure_future`.
+try:
+    ensure_future = asyncio.ensure_future
+except AttributeError:
+    ensure_future = asyncio.async
+
 
 class ZScoreBoundary:
     """
@@ -634,7 +640,7 @@ def done(result):
                         typecheck_return(protocol_self, result)
                         future2.set_result(result)
 
-                    future.add_done_callback(lambda f: asyncio.ensure_future(done(f.result()), loop=protocol_self._loop))
+                    future.add_done_callback(lambda f: ensure_future(done(f.result()), loop=protocol_self._loop))
 
                     return future2
 
@@ -806,7 +812,7 @@ def connection_made(self, transport):
         # Start parsing reader stream.
         self._reader = StreamReader(loop=self._loop)
         self._reader.set_transport(transport)
-        self._reader_f = asyncio.ensure_future(self._reader_coroutine(), loop=self._loop)
+        self._reader_f = ensure_future(self._reader_coroutine(), loop=self._loop)
 
         @asyncio.coroutine
         def initialize():
@@ -825,7 +831,7 @@ def initialize():
                 if self._pubsub_patterns:
                     yield from self._psubscribe(self._subscription, list(self._pubsub_patterns))
 
-        asyncio.ensure_future(initialize(), loop=self._loop)
+        ensure_future(initialize(), loop=self._loop)
 
     def data_received(self, data):
         """ Process data received from Redis server.  """
@@ -980,7 +986,7 @@ def _handle_multi_bulk_reply(self, cb):
 
         # Return the empty queue immediately as an answer.
         if self._in_pubsub:
-            asyncio.ensure_future(self._handle_pubsub_multibulk_reply(reply), loop=self._loop)
+            ensure_future(self._handle_pubsub_multibulk_reply(reply), loop=self._loop)
         else:
             cb(reply)
 
