Update async generators protocol for Python 3.5.2+ (fixes aio-libs#136)

aiopg/cursor.py

@@ -4,7 +4,7 @@
 import psycopg2
 
 from .log import logger
-from .utils import PY_35
+from .utils import PY_35, PY_352
 
 
 class Cursor:
@@ -379,10 +379,12 @@ def __iter__(self):
 
     if PY_35:  # pragma: no branch
 
-        @asyncio.coroutine
         def __aiter__(self):
             return self
 
+        if not PY_352:
+            __aiter__ = asyncio.coroutine(__aiter__)
+
         @asyncio.coroutine
         def __anext__(self):
             ret = yield from self.fetchone()

aiopg/sa/result.py

@@ -5,7 +5,7 @@
 
 from sqlalchemy.sql import expression, sqltypes
 
-from ..utils import PY_35
+from ..utils import PY_35, PY_352
 from . import exc
 
 
@@ -324,10 +324,13 @@ def __iter__(self):
                 yield row
 
     if PY_35:  # pragma: no branch
-        @asyncio.coroutine
+
         def __aiter__(self):
             return self
 
+        if not PY_352:
+            __aiter__ = asyncio.coroutine(__aiter__)
+
         @asyncio.coroutine
         def __anext__(self):
             ret = yield from self.fetchone()

aiopg/utils.py

@@ -3,6 +3,8 @@
 
 
 PY_35 = sys.version_info >= (3, 5)
+PY_352 = sys.version_info >= (3, 5, 2)
+
 if PY_35:
     from collections.abc import Coroutine
     base = Coroutine
@@ -84,10 +86,14 @@ def __aexit__(self, exc_type, exc, tb):
 class _SAConnectionContextManager(_ContextManager):
 
     if PY_35:  # pragma: no branch
-        @asyncio.coroutine
-        def __aiter__(self):
-            result = yield from self._coro
-            return result
+        if PY_352:
+            def __aiter__(self):
+                return self._coro
+        else:
+            @asyncio.coroutine
+            def __aiter__(self):
+                result = yield from self._coro
+                return result
 
 
 class _PoolContextManager(_ContextManager):