From 1c427e77db02840a60bcf3a8e6192513d002c7d4 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:30:13 +0100 Subject: [PATCH] Update typing_extensions imports for Python 3.9 (#18383) --- mypy/build.py | 14 ++++++++++++-- mypy/checkexpr.py | 4 ++-- mypy/fastparse.py | 3 +-- mypy/plugins/attrs.py | 3 +-- mypy/semanal_shared.py | 3 +-- mypy/stubtest.py | 16 +++++++--------- mypy/stubutil.py | 3 +-- mypy/suggestions.py | 3 +-- mypy/typeanal.py | 3 +-- mypy/types.py | 15 +++++++++++++-- mypy/util.py | 3 +-- mypyc/irbuild/builder.py | 3 +-- 12 files changed, 42 insertions(+), 31 deletions(-) diff --git a/mypy/build.py b/mypy/build.py index a1a9206367af..342331243b96 100644 --- a/mypy/build.py +++ b/mypy/build.py @@ -26,8 +26,18 @@ import time import types from collections.abc import Iterator, Mapping, Sequence, Set as AbstractSet -from typing import TYPE_CHECKING, Any, Callable, ClassVar, Final, NamedTuple, NoReturn, TextIO -from typing_extensions import TypeAlias as _TypeAlias, TypedDict +from typing import ( + TYPE_CHECKING, + Any, + Callable, + ClassVar, + Final, + NamedTuple, + NoReturn, + TextIO, + TypedDict, +) +from typing_extensions import TypeAlias as _TypeAlias import mypy.semanal_main from mypy.checker import TypeChecker diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py index 2ba60744635f..b6618109bb44 100644 --- a/mypy/checkexpr.py +++ b/mypy/checkexpr.py @@ -8,8 +8,8 @@ from collections import defaultdict from collections.abc import Iterable, Iterator, Sequence from contextlib import contextmanager -from typing import Callable, ClassVar, Final, Optional, cast -from typing_extensions import TypeAlias as _TypeAlias, assert_never, overload +from typing import Callable, ClassVar, Final, Optional, cast, overload +from typing_extensions import TypeAlias as _TypeAlias, assert_never import mypy.checker import mypy.errorcodes as codes diff --git a/mypy/fastparse.py b/mypy/fastparse.py index 2ffe033b1e08..6985fd567402 100644 --- a/mypy/fastparse.py +++ b/mypy/fastparse.py @@ -4,8 +4,7 @@ import sys import warnings from collections.abc import Sequence -from typing import Any, Callable, Final, Optional, TypeVar, Union, cast -from typing_extensions import Literal, overload +from typing import Any, Callable, Final, Literal, Optional, TypeVar, Union, cast, overload from mypy import defaults, errorcodes as codes, message_registry from mypy.errors import Errors diff --git a/mypy/plugins/attrs.py b/mypy/plugins/attrs.py index e7eed030ce1f..0c29d992c22e 100644 --- a/mypy/plugins/attrs.py +++ b/mypy/plugins/attrs.py @@ -5,8 +5,7 @@ from collections import defaultdict from collections.abc import Iterable, Mapping from functools import reduce -from typing import Final, cast -from typing_extensions import Literal +from typing import Final, Literal, cast import mypy.plugin # To avoid circular imports. from mypy.applytype import apply_generic_arguments diff --git a/mypy/semanal_shared.py b/mypy/semanal_shared.py index 40af5ce81d9e..bdd01ef6a6f3 100644 --- a/mypy/semanal_shared.py +++ b/mypy/semanal_shared.py @@ -3,8 +3,7 @@ from __future__ import annotations from abc import abstractmethod -from typing import Callable, Final, overload -from typing_extensions import Literal, Protocol +from typing import Callable, Final, Literal, Protocol, overload from mypy_extensions import trait diff --git a/mypy/stubtest.py b/mypy/stubtest.py index 21e8736ff6a7..5d19c4777916 100644 --- a/mypy/stubtest.py +++ b/mypy/stubtest.py @@ -29,7 +29,7 @@ from contextlib import redirect_stderr, redirect_stdout from functools import singledispatch from pathlib import Path -from typing import Any, Generic, TypeVar, Union +from typing import Any, Final, Generic, TypeVar, Union from typing_extensions import get_origin, is_typeddict import mypy.build @@ -52,7 +52,7 @@ def __repr__(self) -> str: return "MISSING" -MISSING: typing_extensions.Final = Missing() +MISSING: Final = Missing() T = TypeVar("T") MaybeMissing: typing_extensions.TypeAlias = Union[T, Missing] @@ -65,10 +65,10 @@ def __repr__(self) -> str: return "" -UNREPRESENTABLE: typing_extensions.Final = Unrepresentable() +UNREPRESENTABLE: Final = Unrepresentable() -_formatter: typing_extensions.Final = FancyFormatter(sys.stdout, sys.stderr, False) +_formatter: Final = FancyFormatter(sys.stdout, sys.stderr, False) def _style(message: str, **kwargs: Any) -> str: @@ -1447,7 +1447,7 @@ def verify_typealias( # ==================== -IGNORED_MODULE_DUNDERS: typing_extensions.Final = frozenset( +IGNORED_MODULE_DUNDERS: Final = frozenset( { "__file__", "__doc__", @@ -1469,7 +1469,7 @@ def verify_typealias( } ) -IGNORABLE_CLASS_DUNDERS: typing_extensions.Final = frozenset( +IGNORABLE_CLASS_DUNDERS: Final = frozenset( { # Special attributes "__dict__", @@ -1915,9 +1915,7 @@ class _Arguments: # typeshed added a stub for __main__, but that causes stubtest to check itself -ANNOYING_STDLIB_MODULES: typing_extensions.Final = frozenset( - {"antigravity", "this", "__main__", "_ios_support"} -) +ANNOYING_STDLIB_MODULES: Final = frozenset({"antigravity", "this", "__main__", "_ios_support"}) def test_stubs(args: _Arguments, use_builtins_fixtures: bool = False) -> int: diff --git a/mypy/stubutil.py b/mypy/stubutil.py index 34808be8a8e4..cbb3d2f77414 100644 --- a/mypy/stubutil.py +++ b/mypy/stubutil.py @@ -10,8 +10,7 @@ from collections import defaultdict from collections.abc import Iterable, Iterator, Mapping from contextlib import contextmanager -from typing import Final -from typing_extensions import overload +from typing import Final, overload from mypy_extensions import mypyc_attr diff --git a/mypy/suggestions.py b/mypy/suggestions.py index 193733ecce47..36dc7e8e2acd 100644 --- a/mypy/suggestions.py +++ b/mypy/suggestions.py @@ -29,8 +29,7 @@ import os from collections.abc import Iterator from contextlib import contextmanager -from typing import Callable, NamedTuple, TypeVar, cast -from typing_extensions import TypedDict +from typing import Callable, NamedTuple, TypedDict, TypeVar, cast from mypy.argmap import map_actuals_to_formals from mypy.build import Graph, State diff --git a/mypy/typeanal.py b/mypy/typeanal.py index 6e2106875e1a..7de987a83a2b 100644 --- a/mypy/typeanal.py +++ b/mypy/typeanal.py @@ -5,8 +5,7 @@ import itertools from collections.abc import Iterable, Iterator, Sequence from contextlib import contextmanager -from typing import Callable, Final, TypeVar -from typing_extensions import Protocol +from typing import Callable, Final, Protocol, TypeVar from mypy import errorcodes as codes, message_registry, nodes from mypy.errorcodes import ErrorCode diff --git a/mypy/types.py b/mypy/types.py index 164e18be032e..f3745695889f 100644 --- a/mypy/types.py +++ b/mypy/types.py @@ -5,8 +5,19 @@ import sys from abc import abstractmethod from collections.abc import Iterable, Sequence -from typing import TYPE_CHECKING, Any, ClassVar, Final, NamedTuple, NewType, TypeVar, Union, cast -from typing_extensions import Self, TypeAlias as _TypeAlias, TypeGuard, overload +from typing import ( + TYPE_CHECKING, + Any, + ClassVar, + Final, + NamedTuple, + NewType, + TypeVar, + Union, + cast, + overload, +) +from typing_extensions import Self, TypeAlias as _TypeAlias, TypeGuard import mypy.nodes from mypy.bogus_type import Bogus diff --git a/mypy/util.py b/mypy/util.py index 797498e29e9e..f79d7113ca91 100644 --- a/mypy/util.py +++ b/mypy/util.py @@ -12,8 +12,7 @@ import time from collections.abc import Container, Iterable, Sequence, Sized from importlib import resources as importlib_resources -from typing import IO, Any, Callable, Final, TypeVar -from typing_extensions import Literal +from typing import IO, Any, Callable, Final, Literal, TypeVar orjson: Any try: diff --git a/mypyc/irbuild/builder.py b/mypyc/irbuild/builder.py index 983bd6845207..b0597617bdc5 100644 --- a/mypyc/irbuild/builder.py +++ b/mypyc/irbuild/builder.py @@ -7,8 +7,7 @@ from collections.abc import Iterator, Sequence from contextlib import contextmanager -from typing import Any, Callable, Final, Union -from typing_extensions import overload +from typing import Any, Callable, Final, Union, overload from mypy.build import Graph from mypy.maptype import map_instance_to_supertype