From 7e4c4b8d5c18100b0db58f4d29fac5494fc95b52 Mon Sep 17 00:00:00 2001 From: Yurii Karabas <1998uriyyo@gmail.com> Date: Tue, 7 Feb 2023 17:43:26 -0500 Subject: Remove `typing.Self` workaround Remove ``typing.Self`` workaround, now using :pep:`673` for most methods that return ``Self``. Pull request courtesy Yurii Karabas. Fixes: #9254 Closes: #9255 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/9255 Pull-request-sha: 2947df8ada79f5c3afe9c838e65993302199c2f7 Change-Id: Ic32015ad52e95a61f3913d43ea436aa9402804df --- lib/sqlalchemy/dialects/sqlite/dml.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lib/sqlalchemy/dialects/sqlite') diff --git a/lib/sqlalchemy/dialects/sqlite/dml.py b/lib/sqlalchemy/dialects/sqlite/dml.py index 0b4e7075d..3f829076b 100644 --- a/lib/sqlalchemy/dialects/sqlite/dml.py +++ b/lib/sqlalchemy/dialects/sqlite/dml.py @@ -6,8 +6,6 @@ # mypy: ignore-errors -import typing - from ... import util from ...sql import coercions from ...sql import roles @@ -17,6 +15,7 @@ from ...sql.base import ColumnCollection from ...sql.dml import Insert as StandardInsert from ...sql.elements import ClauseElement from ...sql.expression import alias +from ...util.typing import Self __all__ = ("Insert", "insert") @@ -42,9 +41,6 @@ def insert(table): return Insert(table) -SelfInsert = typing.TypeVar("SelfInsert", bound="Insert") - - class Insert(StandardInsert): """SQLite-specific implementation of INSERT. @@ -97,12 +93,12 @@ class Insert(StandardInsert): @_generative @_on_conflict_exclusive def on_conflict_do_update( - self: SelfInsert, + self, index_elements=None, index_where=None, set_=None, where=None, - ) -> SelfInsert: + ) -> Self: r""" Specifies a DO UPDATE SET action for ON CONFLICT clause. @@ -151,8 +147,8 @@ class Insert(StandardInsert): @_generative @_on_conflict_exclusive def on_conflict_do_nothing( - self: SelfInsert, index_elements=None, index_where=None - ) -> SelfInsert: + self, index_elements=None, index_where=None + ) -> Self: """ Specifies a DO NOTHING action for ON CONFLICT clause. -- cgit v1.2.1