Added missing @asyncio.coroutine

Martiusweb · jonathanslenders · commit 1c19f29b04ab · 2015-10-10T04:06:33.000+02:00
Python 3.5 introduces the couple of keywords async/await.

They are compatible with the "yield from" syntax and generator coroutines as
long as they are decorated with @asyncio.coroutine. Some of them where missing,
so code like:

    async def coro(redis_client):
        await redis_client.watch(key)

failed with the error:

    TypeError: object generator can't be used in 'await' expression
diff --git a/asyncio_redis/connection.py b/asyncio_redis/connection.py
@@ -82,6 +82,7 @@ def _increase_retry_interval(self):
         """ When a connection failed. Increase the interval."""
         self._retry_interval = min(60, 1.5 * self._retry_interval)
 
+    @asyncio.coroutine
     def _reconnect(self):
         """
         Set up Redis connection.
diff --git a/asyncio_redis/protocol.py b/asyncio_redis/protocol.py
@@ -611,6 +611,7 @@ def _get_wrapped_method(self, post_process, suffix, return_type):
         # directly on the protocol, outside of transactions or from the
         # transaction object.
         @wraps(method)
+        @asyncio.coroutine
         def wrapper(protocol_self, *a, **kw):
             # When calling from a transaction
             if protocol_self.in_transaction:
@@ -689,6 +690,7 @@ def get_methods(self):
 # List of all command methods.
 _all_commands = []
 
+
 class _command:
     """ Mark method as command (to be passed through CommandCreator for the
     creation of a protocol method) """
@@ -1981,6 +1983,7 @@ def client_kill(self, address:str) -> StatusReply:
     # LUA scripting
 
     @_command
+    @asyncio.coroutine
     def register_script(self, script:str) -> 'Script':
         """
         Register a LUA script.
@@ -2006,6 +2009,7 @@ def script_flush(self) -> StatusReply:
         return self._query(b'script', b'flush')
 
     @_query_command
+    @asyncio.coroutine
     def script_kill(self) -> StatusReply:
         """
         Kill the script currently in execution.  This raises
@@ -2021,6 +2025,7 @@ def script_kill(self) -> StatusReply:
                 raise
 
     @_query_command
+    @asyncio.coroutine
     def evalsha(self, sha:str,
                         keys:(ListOf(NativeType), NoneType)=None,
                         args:(ListOf(NativeType), NoneType)=None) -> EvalScriptReply:
