[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

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/diff-cache.py

@@ -42,10 +42,10 @@ def load(cache: MetadataStore, s: str) -> Any:
         if "dependencies" in obj:
             all_deps = obj["dependencies"] + obj["suppressed"]
             num_deps = len(obj["dependencies"])
-            thing = list(zip(all_deps, obj["dep_prios"], obj["dep_lines"]))
+            thing = list(zip(all_deps, obj["dep_prios"], obj["dep_lines"], strict=False))
 
             def unzip(x: Any) -> Any:
-                return zip(*x) if x else ((), (), ())
+                return zip(*x, strict=False) if x else ((), (), ())
 
             obj["dependencies"], prios1, lines1 = unzip(sorted(thing[:num_deps]))
             obj["suppressed"], prios2, lines2 = unzip(sorted(thing[num_deps:]))

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
@@ -108,7 +107,7 @@ def apply_generic_arguments(
     # Create a map from type variable id to target type.
     id_to_type: dict[TypeVarId, Type] = {}
 
-    for tvar, type in zip(tvars, orig_types):
+    for tvar, type in zip(tvars, orig_types, strict=False):
         assert not isinstance(type, PartialType), "Internal error: must never apply partial type"
         if type is None:
             continue

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, Optional, Union
-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
@@ -39,7 +38,7 @@
 )
 from mypy.typevars import fill_typevars_with_any
 
-BindableExpression: _TypeAlias = Union[IndexExpr, MemberExpr, NameExpr]
+BindableExpression: _TypeAlias = IndexExpr | MemberExpr | NameExpr
 
 
 class CurrentType(NamedTuple):
@@ -81,7 +80,7 @@ def __repr__(self) -> str:
         return f"Frame({self.id}, {self.types}, {self.unreachable}, {self.conditional_frame})"
 
 
-Assigns = defaultdict[Expression, list[tuple[Type, Optional[Type]]]]
+Assigns = defaultdict[Expression, list[tuple[Type, Type | None]]]
 
 
 class ConditionalTypeBinder:

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,
+)
 
 import mypy.semanal_main
 from mypy.cache import Buffer, CacheMeta
@@ -1974,12 +1982,12 @@ def __init__(
             self.suppressed_set = set(self.suppressed)
             all_deps = self.dependencies + self.suppressed
             assert len(all_deps) == len(self.meta.dep_prios)
-            self.priorities = {id: pri for id, pri in zip(all_deps, self.meta.dep_prios)}
+            self.priorities = {id: pri for id, pri in zip(all_deps, self.meta.dep_prios, strict=False)}
             assert len(all_deps) == len(self.meta.dep_lines)
-            self.dep_line_map = {id: line for id, line in zip(all_deps, self.meta.dep_lines)}
+            self.dep_line_map = {id: line for id, line in zip(all_deps, self.meta.dep_lines, strict=False)}
             assert len(self.meta.dep_hashes) == len(self.meta.dependencies)
             self.dep_hashes = {
-                k: v for (k, v) in zip(self.meta.dependencies, self.meta.dep_hashes)
+                k: v for (k, v) in zip(self.meta.dependencies, self.meta.dep_hashes, strict=False)
             }
             self.error_lines = self.meta.error_lines
             if temporary:

mypy/cache.py

@@ -45,8 +45,7 @@
 from __future__ import annotations
 
 from collections.abc import Sequence
-from typing import Any, Final, Union
-from typing_extensions import TypeAlias as _TypeAlias
+from typing import Any, Final, TypeAlias as _TypeAlias
 
 from librt.internal import (
     Buffer as Buffer,
@@ -384,7 +383,7 @@ def write_str_opt_list(data: Buffer, value: list[str | None]) -> None:
         write_str_opt(data, item)
 
 
-JsonValue: _TypeAlias = Union[None, int, str, bool, list["JsonValue"], dict[str, "JsonValue"]]
+JsonValue: _TypeAlias = None | int | str | bool | list["JsonValue"] | dict[str, "JsonValue"]
 
 
 def read_json_value(data: Buffer) -> JsonValue: