From 47cd34eb809120c83768a771d42a09a53af0bacb Mon Sep 17 00:00:00 2001 From: Maksim Latysh Date: Fri, 30 Dec 2022 10:19:34 +0100 Subject: [PATCH] Removed other files changes except dynamic.py --- lib/sqlalchemy/ext/asyncio/base.py | 2 +- lib/sqlalchemy/orm/attributes.py | 2 +- lib/sqlalchemy/orm/writeonly.py | 5 ++--- lib/sqlalchemy/util/compat.py | 2 +- lib/sqlalchemy/util/langhelpers.py | 2 +- lib/sqlalchemy/util/typing.py | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/sqlalchemy/ext/asyncio/base.py b/lib/sqlalchemy/ext/asyncio/base.py index fce8160131..13d5e40b24 100644 --- a/lib/sqlalchemy/ext/asyncio/base.py +++ b/lib/sqlalchemy/ext/asyncio/base.py @@ -178,7 +178,7 @@ class GeneratorStartableContext(StartableContext[_T_co]): if not is_ctxmanager: await self.gen.aclose() - return start_value # type: ignore[no-any-return] + return start_value async def __aexit__( self, typ: Any, value: Any, traceback: Any diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index 2cdff2cbca..5e6852cbf0 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -62,7 +62,7 @@ from .base import opt_manager_of_class as opt_manager_of_class from .base import PASSIVE_CLASS_MISMATCH # noqa from .base import PASSIVE_NO_FETCH from .base import PASSIVE_NO_FETCH_RELATED # noqa -from .base import PASSIVE_NO_INITIALIZE as PASSIVE_NO_INITIALIZE +from .base import PASSIVE_NO_INITIALIZE from .base import PASSIVE_NO_RESULT from .base import PASSIVE_OFF from .base import PASSIVE_ONLY_PERSISTENT diff --git a/lib/sqlalchemy/orm/writeonly.py b/lib/sqlalchemy/orm/writeonly.py index b62964d50c..5814cef658 100644 --- a/lib/sqlalchemy/orm/writeonly.py +++ b/lib/sqlalchemy/orm/writeonly.py @@ -50,7 +50,6 @@ from ..sql import update from ..sql.dml import Delete from ..sql.dml import Insert from ..sql.dml import Update -from ..util import symbol from ..util.typing import Literal if TYPE_CHECKING: @@ -341,7 +340,7 @@ class WriteOnlyAttributeImpl( c = self._get_collection_history(state, passive) return [(attributes.instance_state(x), x) for x in c.all_items] - def _get_collection_history(self, state: InstanceState[_T], passive: PassiveFlag): + def _get_collection_history(self, state, passive): if self.key in state.committed_state: c = state.committed_state[self.key] else: @@ -445,7 +444,7 @@ class AbstractCollectionWriter(Generic[_T]): if not TYPE_CHECKING: __slots__ = () - def __init__(self, attr: WriteOnlyAttributeImpl, state: InstanceState[_T]) -> None: + def __init__(self, attr, state): self.instance = instance = state.obj() self.attr = attr diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 3d3ee31d65..0f212fad52 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -114,7 +114,7 @@ else: if py310: - anext_ = anext # type: ignore[name-defined] + anext_ = anext else: _NOT_PROVIDED = object() diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index b146905e20..8df4950a39 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -65,7 +65,7 @@ _HM = TypeVar("_HM", bound="hybridmethod[Any]") if compat.py310: def get_annotations(obj: Any) -> Mapping[str, Any]: - return inspect.get_annotations(obj) # type: ignore + return inspect.get_annotations(obj) else: diff --git a/lib/sqlalchemy/util/typing.py b/lib/sqlalchemy/util/typing.py index 873dfa8632..b1ef87db17 100644 --- a/lib/sqlalchemy/util/typing.py +++ b/lib/sqlalchemy/util/typing.py @@ -61,7 +61,7 @@ Self = TypeVar("Self", bound=Any) if compat.py310: # why they took until py310 to put this in stdlib is beyond me, # I've been wanting it since py27 - from types import NoneType as NoneType # type: ignore[attr-defined] + from types import NoneType as NoneType else: NoneType = type(None) # type: ignore -- 2.47.3