Merge pull request #60 from aio-libs/improve-pool-release

make pool.release return future

aiomysql/pool.py

@@ -205,7 +205,11 @@ def release(self, conn):
                 conn.close()
             else:
                 self._free.append(conn)
-            asyncio.Task(self._wakeup(), loop=self._loop)
+            fut = asyncio.Task(self._wakeup(), loop=self._loop)
+        else:
+            fut = asyncio.Future(loop=self._loop)
+            fut.set_result(None)
+        return fut
 
     def get(self):
         warnings.warn("pool.get deprecated use pool.acquire instead",

aiomysql/sa/engine.py

@@ -129,9 +129,7 @@ def release(self, conn):
             raise InvalidRequestError("Cannot release a connection with "
                                       "not finished transaction")
         raw = conn.connection
-        if raw is None:
-            return
-        self._pool.release(raw)
+        return self._pool.release(raw)
 
     def __enter__(self):
         raise RuntimeError(

aiomysql/utils.py

@@ -130,9 +130,11 @@ def __aenter__(self):
 
         @asyncio.coroutine
         def __aexit__(self, exc_type, exc, tb):
-            self._pool.release(self._conn)
-            self._pool = None
-            self._conn = None
+            try:
+                yield from self._pool.release(self._conn)
+            finally:
+                self._pool = None
+                self._conn = None
 
 
 class _PoolConnectionContextManager:
@@ -177,7 +179,7 @@ def __aenter__(self):
         @asyncio.coroutine
         def __aexit__(self, exc_type, exc_val, exc_tb):
             try:
-                self._pool.release(self._conn)
+                yield from self._pool.release(self._conn)
             finally:
                 self._pool = None
                 self._conn = None