From 0352cb931f039cc622618d10d1a7cf2b6ba91aef Mon Sep 17 00:00:00 2001 From: Yurii Karabas <1998uriyyo@gmail.com> Date: Tue, 14 Nov 2023 20:04:35 +0200 Subject: [PATCH] Fix lint errors --- lib/sqlalchemy/orm/scoping.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 5b5dc655a0..c5cdeac171 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -32,6 +32,7 @@ from ..util import ThreadLocalRegistry from ..util import warn from ..util import warn_deprecated from ..util.typing import Protocol +from ..util.typing import TypeVarTuple from ..util.typing import Unpack if TYPE_CHECKING: @@ -76,7 +77,9 @@ if TYPE_CHECKING: from ..sql.selectable import ForUpdateParameter from ..sql.selectable import TypedReturnsRows + _T = TypeVar("_T", bound=Any) +_Ts = TypeVarTuple("_Ts") class QueryPropertyDescriptor(Protocol): @@ -676,14 +679,14 @@ class scoped_session(Generic[_S]): @overload def execute( self, - statement: TypedReturnsRows[_T], + statement: TypedReturnsRows[Tuple[Unpack[_Ts]]], params: Optional[_CoreAnyExecuteParams] = None, *, execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> Result[_T]: + ) -> Result[Unpack[_Ts]]: ... @overload @@ -696,7 +699,7 @@ class scoped_session(Generic[_S]): bind_arguments: Optional[_BindArguments] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> CursorResult[Any]: + ) -> CursorResult[Unpack[Tuple[Any, ...]]]: ... @overload -- 2.47.3