From d9680e17275975657ca0ee01214adc0da9e06b00 Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Sun, 10 Dec 2023 14:40:07 +0100 Subject: [PATCH] fix: Use explicit TypeAlias everywhere --- src/phantom/_utils/misc.py | 3 ++- src/phantom/ext/phonenumbers.py | 3 ++- src/phantom/iso3166.py | 7 ++++--- src/phantom/predicates/_base.py | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/phantom/_utils/misc.py b/src/phantom/_utils/misc.py index 51269f4..0743dba 100644 --- a/src/phantom/_utils/misc.py +++ b/src/phantom/_utils/misc.py @@ -13,6 +13,7 @@ from typing import Tuple from typing import Union +from typing_extensions import TypeAlias from typing_extensions import TypeGuard from typing_extensions import get_args from typing_extensions import get_origin @@ -38,7 +39,7 @@ def resolve_class_attr( ) -BoundType = Union[type, Tuple[type, ...]] +BoundType: TypeAlias = Union[type, Tuple[type, ...]] def _is_union(type_: BoundType) -> bool: diff --git a/src/phantom/ext/phonenumbers.py b/src/phantom/ext/phonenumbers.py index e743e3d..de792fd 100644 --- a/src/phantom/ext/phonenumbers.py +++ b/src/phantom/ext/phonenumbers.py @@ -49,7 +49,8 @@ def _deconstruct_phone_number( def normalize_phone_number( - phone_number: str, country_code: str | None = None + phone_number: str, + country_code: str | None = None, ) -> FormattedPhoneNumber: """ Normalize ``phone_number`` using :py:const:`phonenumbers.PhoneNumberFormat.E164`. diff --git a/src/phantom/iso3166.py b/src/phantom/iso3166.py index 3b373b8..10e2e4e 100644 --- a/src/phantom/iso3166.py +++ b/src/phantom/iso3166.py @@ -15,6 +15,7 @@ from typing import Union from typing import cast +from typing_extensions import TypeAlias from typing_extensions import get_args from phantom import Phantom @@ -33,7 +34,7 @@ "InvalidCountryCode", ) -LiteralAlpha2 = Literal[ +LiteralAlpha2: TypeAlias = Literal[ "AF", "AX", "AL", @@ -334,5 +335,5 @@ def __register_strategy__(cls) -> _hypothesis.SearchStrategy | None: return sampled_from(sorted(ALPHA2)) -Alpha2 = Union[LiteralAlpha2, ParsedAlpha2] -CountryCode = Alpha2 +Alpha2: TypeAlias = Union[LiteralAlpha2, ParsedAlpha2] +CountryCode: TypeAlias = Alpha2 diff --git a/src/phantom/predicates/_base.py b/src/phantom/predicates/_base.py index 100dcd9..94349a0 100644 --- a/src/phantom/predicates/_base.py +++ b/src/phantom/predicates/_base.py @@ -1,6 +1,8 @@ from typing import Callable from typing import TypeVar +from typing_extensions import TypeAlias + T_contra = TypeVar("T_contra", bound=object, contravariant=True) -Predicate = Callable[[T_contra], bool] +Predicate: TypeAlias = Callable[[T_contra], bool]