From 18a73fb1d1c267842ead5dacd05a49f4344d8b22 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 6 May 2022 16:09:52 -0400 Subject: revenge of pep 484 trying to get remaining must-haves for ORM Change-Id: I66a3ecbbb8e5ba37c818c8a92737b576ecf012f7 --- lib/sqlalchemy/util/compat.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/util/compat.py') diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 24fa0f3e3..adbbf143f 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -20,11 +20,14 @@ import typing from typing import Any from typing import Callable from typing import Dict +from typing import Iterable from typing import List from typing import Mapping from typing import Optional from typing import Sequence +from typing import Set from typing import Tuple +from typing import Type py311 = sys.version_info >= (3, 11) @@ -225,7 +228,7 @@ def inspect_formatargspec( return result -def dataclass_fields(cls): +def dataclass_fields(cls: Type[Any]) -> Iterable[dataclasses.Field[Any]]: """Return a sequence of all dataclasses.Field objects associated with a class.""" @@ -235,12 +238,12 @@ def dataclass_fields(cls): return [] -def local_dataclass_fields(cls): +def local_dataclass_fields(cls: Type[Any]) -> Iterable[dataclasses.Field[Any]]: """Return a sequence of all dataclasses.Field objects associated with a class, excluding those that originate from a superclass.""" if dataclasses.is_dataclass(cls): - super_fields = set() + super_fields: Set[dataclasses.Field[Any]] = set() for sup in cls.__bases__: super_fields.update(dataclass_fields(sup)) return [f for f in dataclasses.fields(cls) if f not in super_fields] -- cgit v1.2.1