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

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

misc/analyze_cache.py

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

misc/incremental_checker.py

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

mypy/build.py

@@ -31,6 +31,7 @@
     Callable,
     ClassVar,
     Dict,
+    Final,
     Iterator,
     Mapping,
     NamedTuple,
@@ -39,7 +40,6 @@
     TextIO,
 )
 from typing_extensions import TypeAlias as _TypeAlias, TypedDict
-from typing import Final
 
 import mypy.semanal_main
 from mypy.checker import TypeChecker

mypy/checker.py

@@ -9,6 +9,7 @@
     AbstractSet,
     Callable,
     Dict,
+    Final,
     Generic,
     Iterable,
     Iterator,
@@ -23,7 +24,6 @@
     overload,
 )
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 import mypy.checkexpr
 from mypy import errorcodes as codes, message_registry, nodes, operators

mypy/checkexpr.py

@@ -6,9 +6,8 @@
 import time
 from collections import defaultdict
 from contextlib import contextmanager
-from typing import Callable, ClassVar, Iterable, Iterator, List, Optional, Sequence, cast
+from typing import Callable, ClassVar, Final, Iterable, Iterator, List, Optional, Sequence, cast
 from typing_extensions import TypeAlias as _TypeAlias, overload
-from typing import Final
 
 import mypy.checker
 import mypy.errorcodes as codes

mypy/checkpattern.py

@@ -3,8 +3,7 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing import NamedTuple
-from typing import Final
+from typing import Final, NamedTuple
 
 import mypy.checker
 from mypy import message_registry

mypy/checkstrformat.py

@@ -13,9 +13,8 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Callable, Dict, Match, Pattern, Tuple, Union, cast
+from typing import TYPE_CHECKING, Callable, Dict, Final, Match, Pattern, Tuple, Union, cast
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 import mypy.errorcodes as codes
 from mypy.errors import Errors

mypy/config_parser.py

@@ -19,6 +19,7 @@
     Any,
     Callable,
     Dict,
+    Final,
     Iterable,
     List,
     Mapping,
@@ -29,7 +30,6 @@
     Union,
 )
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 from mypy import defaults
 from mypy.options import PER_MODULE_OPTIONS, Options

mypy/constant_fold.py

@@ -5,8 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Union
-from typing import Final
+from typing import Final, Union
 
 from mypy.nodes import (
     ComplexExpr,

mypy/constraints.py

@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Iterable, List, Sequence, cast
-from typing import Final
+from typing import TYPE_CHECKING, Final, Iterable, List, Sequence, cast
 
 import mypy.subtypes
 import mypy.typeops

mypy/dmypy_server.py

@@ -17,9 +17,8 @@
 import time
 import traceback
 from contextlib import redirect_stderr, redirect_stdout
-from typing import AbstractSet, Any, Callable, List, Sequence, Tuple
+from typing import AbstractSet, Any, Callable, Final, List, Sequence, Tuple
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 import mypy.build
 import mypy.errors

mypy/dmypy_util.py

@@ -6,8 +6,7 @@
 from __future__ import annotations
 
 import json
-from typing import Any
-from typing import Final
+from typing import Any, Final
 
 from mypy.ipc import IPCBase
 

mypy/errors.py

@@ -4,9 +4,8 @@
 import sys
 import traceback
 from collections import defaultdict
-from typing import Callable, Iterable, NoReturn, Optional, TextIO, Tuple, TypeVar
+from typing import Callable, Final, Iterable, NoReturn, Optional, TextIO, Tuple, TypeVar
 from typing_extensions import Literal, TypeAlias as _TypeAlias
-from typing import Final
 
 from mypy import errorcodes as codes
 from mypy.errorcodes import IMPORT, ErrorCode

mypy/expandtype.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from typing import Iterable, Mapping, Sequence, TypeVar, cast, overload
-from typing import Final
+from typing import Final, Iterable, Mapping, Sequence, TypeVar, cast, overload
 
 from mypy.nodes import ARG_POS, ARG_STAR, ArgKind, Var
 from mypy.state import state

mypy/fastparse.py

@@ -4,9 +4,8 @@
 import re
 import sys
 import warnings
-from typing import Any, Callable, List, Optional, Sequence, TypeVar, Union, cast
+from typing import Any, Callable, Final, List, Optional, Sequence, TypeVar, Union, cast
 from typing_extensions import Literal, overload
-from typing import Final
 
 from mypy import defaults, errorcodes as codes, message_registry
 from mypy.errors import Errors

mypy/find_sources.py

@@ -4,8 +4,7 @@
 
 import functools
 import os
-from typing import Sequence
-from typing import Final
+from typing import Final, Sequence
 
 from mypy.fscache import FileSystemCache
 from mypy.modulefinder import PYTHON_EXTENSIONS, BuildSource, matches_exclude, mypy_path

mypy/fixup.py

@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any
-from typing import Final
+from typing import Any, Final
 
 from mypy.lookup import lookup_fully_qualified
 from mypy.nodes import (

mypy/ipc.py

@@ -12,8 +12,7 @@
 import sys
 import tempfile
 from types import TracebackType
-from typing import Callable
-from typing import Final
+from typing import Callable, 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 typing import Any, Iterable, Optional, Tuple
+from typing import Any, Final, Iterable, Optional, Tuple
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 from mypy.nodes import (
     LITERAL_NO,

mypy/main.py

@@ -8,8 +8,7 @@
 import sys
 import time
 from gettext import gettext
-from typing import IO, Any, NoReturn, Sequence, TextIO
-from typing import Final
+from typing import IO, Any, Final, NoReturn, Sequence, TextIO
 
 from mypy import build, defaults, state, util
 from mypy.config_parser import get_config_module_names, parse_config_file, parse_version

mypy/message_registry.py

@@ -8,8 +8,7 @@
 
 from __future__ import annotations
 
-from typing import NamedTuple
-from typing import Final
+from typing import Final, NamedTuple
 
 from mypy import errorcodes as codes
 

mypy/messages.py

@@ -16,8 +16,7 @@
 import re
 from contextlib import contextmanager
 from textwrap import dedent
-from typing import Any, Callable, Collection, Iterable, Iterator, List, Sequence, cast
-from typing import Final
+from typing import Any, Callable, Collection, Final, Iterable, Iterator, List, Sequence, cast
 
 import mypy.typeops
 from mypy import errorcodes as codes, message_registry

mypy/modulefinder.py

@@ -21,9 +21,8 @@
 else:
     import tomli as tomllib
 
-from typing import Dict, List, NamedTuple, Optional, Tuple, Union
+from typing import Dict, Final, List, NamedTuple, Optional, Tuple, Union
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 from mypy import pyinfo
 from mypy.fscache import FileSystemCache

mypy/nodes.py

@@ -11,6 +11,7 @@
     Any,
     Callable,
     Dict,
+    Final,
     Iterator,
     List,
     Optional,
@@ -21,7 +22,6 @@
     cast,
 )
 from typing_extensions import TypeAlias as _TypeAlias, TypeGuard
-from typing import Final
 
 from mypy_extensions import trait
 

mypy/options.py

@@ -4,8 +4,7 @@
 import re
 import sys
 import sysconfig
-from typing import Any, Callable, Dict, Mapping, Pattern
-from typing import Final
+from typing import Any, Callable, Final, Mapping, Pattern
 
 from mypy import defaults
 from mypy.errorcodes import ErrorCode, error_codes

mypy/plugins/attrs.py

@@ -4,9 +4,8 @@
 
 from collections import defaultdict
 from functools import reduce
-from typing import Iterable, List, Mapping, cast
+from typing import Final, Iterable, List, Mapping, cast
 from typing_extensions import Literal
-from typing import Final
 
 import mypy.plugin  # To avoid circular imports.
 from mypy.applytype import apply_generic_arguments

mypy/plugins/dataclasses.py

@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Iterator, Optional
-from typing import Final
+from typing import TYPE_CHECKING, Final, Iterator
 
 from mypy import errorcodes, message_registry
 from mypy.expandtype import expand_type, expand_type_by_instance

mypy/plugins/enums.py

@@ -12,8 +12,7 @@
 """
 from __future__ import annotations
 
-from typing import Iterable, Sequence, TypeVar, cast
-from typing import Final
+from typing import Final, Iterable, Sequence, TypeVar, cast
 
 import mypy.plugin  # To avoid circular imports.
 from mypy.nodes import TypeInfo

mypy/plugins/functools.py

@@ -1,8 +1,7 @@
 """Plugin for supporting the functools standard library module."""
 from __future__ import annotations
 
-from typing import NamedTuple
-from typing import Final
+from typing import Final, NamedTuple
 
 import mypy.plugin
 from mypy.nodes import ARG_POS, ARG_STAR2, Argument, FuncItem, Var

mypy/plugins/singledispatch.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from typing import NamedTuple, Sequence, TypeVar, Union
+from typing import Final, NamedTuple, Sequence, TypeVar, Union
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 from mypy.messages import format_type
 from mypy.nodes import ARG_POS, Argument, Block, ClassDef, Context, SymbolTable, TypeInfo, Var

mypy/reachability.py

@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Tuple, TypeVar
-from typing import Final
+from typing import Final, Tuple, TypeVar
 
 from mypy.literals import literal
 from mypy.nodes import (

mypy/renaming.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import Iterator
-from typing import Final
+from typing import Final, Iterator
 
 from mypy.nodes import (
     AssignmentStmt,

mypy/report.py

@@ -12,9 +12,8 @@
 import tokenize
 from abc import ABCMeta, abstractmethod
 from operator import attrgetter
-from typing import Any, Callable, Dict, Iterator, Tuple
+from typing import Any, Callable, Dict, Final, Iterator, Tuple
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 from urllib.request import pathname2url
 
 from mypy import stats

mypy/semanal.py

@@ -51,9 +51,8 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import Any, Callable, Collection, Iterable, Iterator, List, TypeVar, cast
+from typing import Any, Callable, Collection, Final, Iterable, Iterator, List, TypeVar, cast
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 from mypy import errorcodes as codes, message_registry
 from mypy.constant_fold import constant_fold_expr

mypy/semanal_enum.py

@@ -5,8 +5,7 @@
 
 from __future__ import annotations
 
-from typing import cast
-from typing import Final
+from typing import Final, cast
 
 from mypy.nodes import (
     ARG_NAMED,

mypy/semanal_main.py

@@ -27,9 +27,8 @@
 from __future__ import annotations
 
 from contextlib import nullcontext
-from typing import TYPE_CHECKING, Callable, List, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Callable, Final, List, Optional, Tuple, Union
 from typing_extensions import TypeAlias as _TypeAlias
-from typing import Final
 
 import mypy.build
 import mypy.state