Update imports after dropping Python 3.9

misc/analyze_cache.py

@@ -7,8 +7,7 @@
 import os.path
 from collections import Counter
 from collections.abc import Iterable
-from typing import Any, Final
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Any, Final, TypeAlias as _TypeAlias
 
 ROOT: Final = ".mypy_cache/3.5"
 

misc/incremental_checker.py

@@ -44,8 +44,7 @@
 import textwrap
 import time
 from argparse import ArgumentParser, Namespace, RawDescriptionHelpFormatter
-from typing import Any, Final
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Any, Final, TypeAlias as _TypeAlias
 
 CACHE_PATH: Final = ".incremental_checker_cache.json"
 MYPY_REPO_URL: Final = "https://github.com/python/mypy.git"

misc/perf_checker.py

@@ -8,7 +8,7 @@
 import subprocess
 import textwrap
 import time
-from typing import Callable
+from collections.abc import Callable
 
 
 class Command:

mypy/api.py

@@ -46,8 +46,9 @@
 from __future__ import annotations
 
 import sys
+from collections.abc import Callable
 from io import StringIO
-from typing import Callable, TextIO
+from typing import TextIO
 
 
 def _run(main_wrapper: Callable[[TextIO, TextIO], None]) -> tuple[str, str, int]:

mypy/applytype.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Sequence
-from typing import Callable
+from collections.abc import Callable, Iterable, Sequence
 
 import mypy.subtypes
 from mypy.erasetype import erase_typevars

mypy/argmap.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable, Sequence
+from typing import TYPE_CHECKING
 
 from mypy import nodes
 from mypy.maptype import map_instance_to_supertype

mypy/binder.py

@@ -3,8 +3,7 @@
 from collections import defaultdict
 from collections.abc import Iterator
 from contextlib import contextmanager
-from typing import NamedTuple
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import NamedTuple, TypeAlias as _TypeAlias
 
 from mypy.erasetype import remove_instance_last_known_values
 from mypy.literals import Key, extract_var_from_literal_hash, literal, literal_hash, subkeys

mypy/build.py

@@ -24,9 +24,17 @@
 import sys
 import time
 import types
-from collections.abc import Iterator, Mapping, Sequence, Set as AbstractSet
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Final, NoReturn, TextIO, TypedDict
-from typing_extensions import TypeAlias as _TypeAlias
+from collections.abc import Callable, Iterator, Mapping, Sequence, Set as AbstractSet
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    ClassVar,
+    Final,
+    NoReturn,
+    TextIO,
+    TypeAlias as _TypeAlias,
+    TypedDict,
+)
 
 from librt.internal import cache_version
 

mypy/cache.py

@@ -48,8 +48,7 @@
 from __future__ import annotations
 
 from collections.abc import Sequence
-from typing import Any, Final
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Any, Final, TypeAlias as _TypeAlias
 
 from librt.internal import (
     ReadBuffer as ReadBuffer,

mypy/checker.py

@@ -4,10 +4,19 @@
 
 import itertools
 from collections import defaultdict
-from collections.abc import Iterable, Iterator, Mapping, Sequence, Set as AbstractSet
+from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence, Set as AbstractSet
 from contextlib import ExitStack, contextmanager
-from typing import Callable, Final, Generic, Literal, NamedTuple, TypeVar, cast, overload
-from typing_extensions import TypeAlias as _TypeAlias, TypeGuard
+from typing import (
+    Final,
+    Generic,
+    Literal,
+    NamedTuple,
+    TypeAlias as _TypeAlias,
+    TypeGuard,
+    TypeVar,
+    cast,
+    overload,
+)
 
 import mypy.checkexpr
 from mypy import errorcodes as codes, join, message_registry, nodes, operators

mypy/checkexpr.py

@@ -6,10 +6,10 @@
 import itertools
 import time
 from collections import defaultdict
-from collections.abc import Iterable, Iterator, Sequence
+from collections.abc import Callable, Iterable, Iterator, Sequence
 from contextlib import contextmanager, nullcontext
-from typing import Callable, ClassVar, Final, cast, overload
-from typing_extensions import TypeAlias as _TypeAlias, assert_never
+from typing import ClassVar, Final, TypeAlias as _TypeAlias, cast, overload
+from typing_extensions import assert_never
 
 import mypy.checker
 import mypy.errorcodes as codes

mypy/checkmember.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
-from typing import Callable, TypeVar, cast
+from collections.abc import Callable, Sequence
+from typing import TypeVar, cast
 
 from mypy import message_registry, state
 from mypy.checker_shared import TypeCheckerSharedApi

mypy/checkstrformat.py

@@ -13,9 +13,9 @@
 from __future__ import annotations
 
 import re
+from collections.abc import Callable
 from re import Match, Pattern
-from typing import Callable, Final, cast
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Final, TypeAlias as _TypeAlias, cast
 
 import mypy.errorcodes as codes
 from mypy import message_registry

mypy/config_parser.py

@@ -13,9 +13,9 @@
 else:
     import tomli as tomllib
 
-from collections.abc import Mapping, MutableMapping, Sequence
-from typing import Any, Callable, Final, TextIO
-from typing_extensions import Never, TypeAlias
+from collections.abc import Callable, Mapping, MutableMapping, Sequence
+from typing import Any, Final, TextIO, TypeAlias
+from typing_extensions import Never
 
 from mypy import defaults
 from mypy.options import PER_MODULE_OPTIONS, Options

mypy/constraints.py

@@ -3,8 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING, Final, cast
-from typing_extensions import TypeGuard
+from typing import TYPE_CHECKING, Final, TypeGuard, cast
 
 import mypy.subtypes
 import mypy.typeops

mypy/dmypy/client.py

@@ -14,8 +14,8 @@
 import sys
 import time
 import traceback
-from collections.abc import Mapping
-from typing import Any, Callable, NoReturn
+from collections.abc import Callable, Mapping
+from typing import Any, NoReturn
 
 from mypy.dmypy_os import alive, kill
 from mypy.dmypy_util import DEFAULT_STATUS_FILE, receive, send

mypy/dmypy_os.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import sys
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 if sys.platform == "win32":
     import ctypes

mypy/dmypy_server.py

@@ -16,10 +16,9 @@
 import sys
 import time
 import traceback
-from collections.abc import Sequence, Set as AbstractSet
+from collections.abc import Callable, Sequence, Set as AbstractSet
 from contextlib import redirect_stderr, redirect_stdout
-from typing import Any, Callable, Final
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Any, Final, TypeAlias as _TypeAlias
 
 import mypy.build
 import mypy.errors

mypy/erasetype.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import Container
-from typing import Callable, cast
+from collections.abc import Callable, Container
+from typing import cast
 
 from mypy.nodes import ARG_STAR, ARG_STAR2
 from mypy.types import (

mypy/errors.py

@@ -4,10 +4,10 @@
 import sys
 import traceback
 from collections import defaultdict
-from collections.abc import Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from itertools import chain
-from typing import Callable, Final, NoReturn, TextIO, TypeVar
-from typing_extensions import Literal, Self, TypeAlias as _TypeAlias
+from typing import Final, Literal, NoReturn, TextIO, TypeAlias as _TypeAlias, TypeVar
+from typing_extensions import Self
 
 from mypy import errorcodes as codes
 from mypy.error_formatter import ErrorFormatter

mypy/exportjson.py

@@ -16,8 +16,7 @@
 import argparse
 import json
 import sys
-from typing import Any
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Any, TypeAlias as _TypeAlias
 
 from librt.internal import ReadBuffer
 

mypy/exprtotype.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 from mypy.fastparse import parse_type_string
 from mypy.nodes import (

mypy/fastparse.py

@@ -3,8 +3,8 @@
 import re
 import sys
 import warnings
-from collections.abc import Sequence
-from typing import Any, Callable, Final, Literal, TypeVar, Union, cast, overload
+from collections.abc import Callable, Sequence
+from typing import Any, Final, Literal, TypeVar, cast, overload
 
 from mypy import defaults, errorcodes as codes, message_registry
 from mypy.errors import Errors

mypy/inspections.py

@@ -2,8 +2,8 @@
 
 import os
 from collections import defaultdict
+from collections.abc import Callable
 from functools import cmp_to_key
-from typing import Callable
 
 from mypy.build import State
 from mypy.messages import format_type

mypy/ipc.py

@@ -12,8 +12,9 @@
 import shutil
 import sys
 import tempfile
+from collections.abc import Callable
 from types import TracebackType
-from typing import Callable, Final
+from typing import Final
 
 if sys.platform == "win32":
     # This may be private, but it is needed for IPC on Windows, and is basically stable

mypy/literals.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
-from typing import Any, Final
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Any, Final, TypeAlias as _TypeAlias
 
 from mypy.nodes import (
     LITERAL_NO,

mypy/meet.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 from mypy import join
 from mypy.erasetype import erase_type

mypy/messages.py

@@ -14,10 +14,10 @@
 import difflib
 import itertools
 import re
-from collections.abc import Collection, Iterable, Iterator, Sequence
+from collections.abc import Callable, Collection, Iterable, Iterator, Sequence
 from contextlib import contextmanager
 from textwrap import dedent
-from typing import Any, Callable, Final, cast
+from typing import Any, Final, cast
 
 import mypy.typeops
 from mypy import errorcodes as codes, message_registry

mypy/modulefinder.py

@@ -13,8 +13,7 @@
 import subprocess
 import sys
 from enum import Enum, unique
-from typing import Final
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Final, TypeAlias as _TypeAlias
 
 from pathspec import PathSpec
 from pathspec.patterns.gitwildmatch import GitWildMatchPatternError

mypy/mro.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 from mypy.nodes import TypeInfo
 from mypy.types import Instance

mypy/nodes.py

@@ -5,10 +5,19 @@
 import os
 from abc import abstractmethod
 from collections import defaultdict
-from collections.abc import Iterator, Sequence
+from collections.abc import Callable, Iterator, Sequence
 from enum import Enum, unique
-from typing import TYPE_CHECKING, Any, Callable, Final, Optional, TypeVar, Union, cast
-from typing_extensions import TypeAlias as _TypeAlias, TypeGuard
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Final,
+    Optional,
+    TypeAlias as _TypeAlias,
+    TypeGuard,
+    TypeVar,
+    Union,
+    cast,
+)
 
 from librt.internal import (
     read_float as read_float_bare,

mypy/options.py

@@ -5,8 +5,9 @@
 import sys
 import sysconfig
 import warnings
+from collections.abc import Callable
 from re import Pattern
-from typing import Any, Callable, Final
+from typing import Any, Final
 
 from mypy import defaults
 from mypy.errorcodes import ErrorCode, error_codes

mypy/plugin.py

@@ -119,7 +119,8 @@ class C: pass
 from __future__ import annotations
 
 from abc import abstractmethod
-from typing import TYPE_CHECKING, Any, Callable, NamedTuple, TypeVar
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar
 
 from mypy_extensions import mypyc_attr, trait
 

mypy/plugins/default.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from functools import partial
-from typing import Callable, Final
+from typing import Final
 
 import mypy.errorcodes as codes
 from mypy import message_registry