From: long2ice Date: Fri, 14 Jan 2022 08:50:26 +0000 (-0500) Subject: Remove pymysql in asyncmy X-Git-Tag: rel_2_0_0b1~545 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4fe2b83ab3ce8cee1e2f4353dfcbea515b4f8d1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Remove pymysql in asyncmy Removed unnecessary dependency on PyMySQL from the asyncmy dialect. Pull request courtesy long2ice. Fixes: #7567 Closes: #7568 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/7568 Pull-request-sha: 48cbb3e3c249e431dfd91e88fcb3284af83671e5 Change-Id: Iad5048eaa5de6ad6666b2120df6608fd1bf50e02 --- diff --git a/doc/build/changelog/unreleased_14/7567.rst b/doc/build/changelog/unreleased_14/7567.rst new file mode 100644 index 0000000000..38fa6f39a1 --- /dev/null +++ b/doc/build/changelog/unreleased_14/7567.rst @@ -0,0 +1,7 @@ +.. change:: + :tags: bug, mysql + :tickets: 7567 + + Removed unnecessary dependency on PyMySQL from the asyncmy dialect. Pull + request courtesy long2ice. + diff --git a/lib/sqlalchemy/dialects/mysql/asyncmy.py b/lib/sqlalchemy/dialects/mysql/asyncmy.py index 02d6b1e9ea..3eb19411e3 100644 --- a/lib/sqlalchemy/dialects/mysql/asyncmy.py +++ b/lib/sqlalchemy/dialects/mysql/asyncmy.py @@ -230,9 +230,8 @@ class AsyncAdaptFallback_asyncmy_connection(AsyncAdapt_asyncmy_connection): class AsyncAdapt_asyncmy_dbapi: - def __init__(self, asyncmy, pymysql): + def __init__(self, asyncmy): self.asyncmy = asyncmy - self.pymysql = pymysql self.paramstyle = "format" self._init_dbapi_attributes() @@ -252,16 +251,6 @@ class AsyncAdapt_asyncmy_dbapi: ): setattr(self, name, getattr(self.asyncmy.errors, name)) - for name in ( - "NUMBER", - "STRING", - "DATETIME", - "BINARY", - "TIMESTAMP", - "Binary", - ): - setattr(self, name, getattr(self.pymysql, name)) - def connect(self, *arg, **kw): async_fallback = kw.pop("async_fallback", False) @@ -288,9 +277,7 @@ class MySQLDialect_asyncmy(MySQLDialect_pymysql): @classmethod def dbapi(cls): - return AsyncAdapt_asyncmy_dbapi( - __import__("asyncmy"), __import__("pymysql") - ) + return AsyncAdapt_asyncmy_dbapi(__import__("asyncmy")) @classmethod def get_pool_class(cls, url): @@ -319,7 +306,7 @@ class MySQLDialect_asyncmy(MySQLDialect_pymysql): ) def _found_rows_client_flag(self): - from pymysql.constants import CLIENT + from asyncmy.constants import CLIENT return CLIENT.FOUND_ROWS