From: Arie Bovenberg <a.c.bovenberg@gmail.com>
Date: Wed, 19 Jan 2022 20:29:26 +0000 (+0100)
Subject: remove overlapping slots already defined in base classes
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf7defc72417f17cdcd5105317d9bd0080f94a14;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

remove overlapping slots already defined in base classes
---

diff --git a/lib/sqlalchemy/dialects/mysql/aiomysql.py b/lib/sqlalchemy/dialects/mysql/aiomysql.py
index 975467c24f..df716346ef 100644
--- a/lib/sqlalchemy/dialects/mysql/aiomysql.py
+++ b/lib/sqlalchemy/dialects/mysql/aiomysql.py
@@ -179,7 +179,7 @@ class AsyncAdapt_aiomysql_ss_cursor(AsyncAdapt_aiomysql_cursor):
 
 class AsyncAdapt_aiomysql_connection(AdaptedConnection):
     await_ = staticmethod(await_only)
-    __slots__ = ("dbapi", "_connection", "_execute_mutex")
+    __slots__ = ("dbapi", "_execute_mutex")
 
     def __init__(self, dbapi, connection):
         self.dbapi = dbapi
diff --git a/lib/sqlalchemy/dialects/sqlite/aiosqlite.py b/lib/sqlalchemy/dialects/sqlite/aiosqlite.py
index c73afc9d1c..e88ab1a0fa 100644
--- a/lib/sqlalchemy/dialects/sqlite/aiosqlite.py
+++ b/lib/sqlalchemy/dialects/sqlite/aiosqlite.py
@@ -165,7 +165,7 @@ class AsyncAdapt_aiosqlite_ss_cursor(AsyncAdapt_aiosqlite_cursor):
 
 class AsyncAdapt_aiosqlite_connection(AdaptedConnection):
     await_ = staticmethod(await_only)
-    __slots__ = ("dbapi", "_connection")
+    __slots__ = ("dbapi",)
 
     def __init__(self, dbapi, connection):
         self.dbapi = dbapi
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index b67a212c83..4045eae907 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -2257,7 +2257,7 @@ class TwoPhaseTransaction(RootTransaction):
 
     """
 
-    __slots__ = ("connection", "is_active", "xid", "_is_prepared")
+    __slots__ = ("xid", "_is_prepared")
 
     def __init__(self, connection, xid):
         self._is_prepared = False
diff --git a/lib/sqlalchemy/engine/row.py b/lib/sqlalchemy/engine/row.py
index 16215ccc47..75c56450e2 100644
--- a/lib/sqlalchemy/engine/row.py
+++ b/lib/sqlalchemy/engine/row.py
@@ -194,10 +194,7 @@ class ROMappingView(
     collections_abc.ValuesView,
     collections_abc.ItemsView,
 ):
-    __slots__ = (
-        "_mapping",
-        "_items",
-    )
+    __slots__ = ("_items",)
 
     def __init__(self, mapping, items):
         self._mapping = mapping
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index c4aac5a385..b035dbef2f 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -64,7 +64,6 @@ class ColumnProperty(StrategizedProperty[_T]):
         "descriptor",
         "active_history",
         "expire_on_flush",
-        "info",
         "doc",
         "strategy_key",
         "_creation_order",