From f053640dc7766af8a1d472b0765fd33710faf4d6 Mon Sep 17 00:00:00 2001 From: Albert Wang Date: Tue, 9 Nov 2021 23:23:09 -0500 Subject: [PATCH 1/2] Remove broken loop argument --- aiomysql/connection.py | 8 +++----- aiomysql/pool.py | 2 +- tests/_testutils.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/aiomysql/connection.py b/aiomysql/connection.py index 8bf5cbf4..afce4e8e 100644 --- a/aiomysql/connection.py +++ b/aiomysql/connection.py @@ -477,8 +477,7 @@ async def _connect(self): self._reader, self._writer = await \ asyncio.wait_for( asyncio.open_unix_connection( - self._unix_socket, - loop=self._loop), + self._unix_socket), timeout=self.connect_timeout) self.host_info = "Localhost via UNIX socket: " + \ self._unix_socket @@ -487,8 +486,7 @@ async def _connect(self): asyncio.wait_for( asyncio.open_connection( self._host, - self._port, - loop=self._loop), + self._port), timeout=self.connect_timeout) self._set_keep_alive() self.host_info = "socket %s:%d" % (self._host, self._port) @@ -706,7 +704,7 @@ async def _request_authentication(self): # open_connection will cause it to negotiate TLS on an existing # connection not initiate a new one. self._reader, self._writer = await asyncio.open_connection( - sock=raw_sock, ssl=self._ssl_context, loop=self._loop, + sock=raw_sock, ssl=self._ssl_context, server_hostname=self._host ) diff --git a/aiomysql/pool.py b/aiomysql/pool.py index 1f194dc0..a17e3fca 100644 --- a/aiomysql/pool.py +++ b/aiomysql/pool.py @@ -43,7 +43,7 @@ def __init__(self, minsize, maxsize, echo, pool_recycle, loop, **kwargs): self._conn_kwargs = kwargs self._acquiring = 0 self._free = collections.deque(maxlen=maxsize) - self._cond = asyncio.Condition(loop=loop) + self._cond = asyncio.Condition() self._used = set() self._terminated = set() self._closing = False diff --git a/tests/_testutils.py b/tests/_testutils.py index 3ccb4c8a..1f198cc9 100644 --- a/tests/_testutils.py +++ b/tests/_testutils.py @@ -12,7 +12,7 @@ def run_until_complete(fun): def wrapper(test, *args, **kw): loop = test.loop ret = loop.run_until_complete( - asyncio.wait_for(fun(test, *args, **kw), 15, loop=loop)) + asyncio.wait_for(fun(test, *args, **kw), 15)) return ret return wrapper From 0c12aa37c6b9fe152d1fc86d0998fbbf22b1edd5 Mon Sep 17 00:00:00 2001 From: Albert Wang Date: Thu, 11 Nov 2021 20:57:53 -0500 Subject: [PATCH 2/2] Update changelog --- CHANGES.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index d0f6b604..31066c91 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Changes ------- +0.0.22 (2021-11-11) +^^^^^^^^^^^^^^^^^^^ + +* Support python 3.10 #505 + + 0.0.21 (2020-11-26) ^^^^^^^^^^^^^^^^^^^