Run pyupgrade --py38-plus on the source code (#15575)

misc/analyze_cache.py

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

misc/incremental_checker.py

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

mypy/build.py

@@ -31,14 +31,15 @@
  Callable,
  ClassVar,
  Dict,
+ Final,
  Iterator,
  Mapping,
  NamedTuple,
  NoReturn,
  Sequence,
  TextIO,
 )
-from typing_extensions import Final, TypeAlias as _TypeAlias, TypedDict
+from typing_extensions import TypeAlias as _TypeAlias, TypedDict
 
 import mypy.semanal_main
 from mypy.checker import TypeChecker

mypy/checker.py

@@ -9,6 +9,7 @@
  AbstractSet,
  Callable,
  Dict,
+ Final,
  Generic,
  Iterable,
  Iterator,
@@ -22,7 +23,7 @@
  cast,
  overload,
 )
-from typing_extensions import Final, TypeAlias as _TypeAlias
+from typing_extensions import TypeAlias as _TypeAlias
 
 import mypy.checkexpr
 from mypy import errorcodes as codes, message_registry, nodes, operators
@@ -1546,7 +1547,7 @@ def check_reverse_op_method(
  if opt_meta is not None:
  forward_inst = opt_meta
 
- def has_readable_member(typ: Union[UnionType, Instance], name: str) -> bool:
+ def has_readable_member(typ: UnionType | Instance, name: str) -> bool:
  # TODO: Deal with attributes of TupleType etc.
  if isinstance(typ, Instance):
  return typ.type.has_readable_member(name)

mypy/checkexpr.py

@@ -6,8 +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_extensions import Final, TypeAlias as _TypeAlias, overload
+from typing import Callable, ClassVar, Final, Iterable, Iterator, List, Optional, Sequence, cast
+from typing_extensions import TypeAlias as _TypeAlias, overload
 
 import mypy.checker
 import mypy.errorcodes as codes
@@ -5581,7 +5581,7 @@ def replace_callable_return_type(c: CallableType, new_ret_type: Type) -> Callabl
  return c.copy_modified(ret_type=new_ret_type)
 
 
-def apply_poly(tp: CallableType, poly_tvars: Sequence[TypeVarLikeType]) -> Optional[CallableType]:
+def apply_poly(tp: CallableType, poly_tvars: Sequence[TypeVarLikeType]) -> CallableType | None:
  """Make free type variables generic in the type if possible.
 
  This will translate the type `tp` while trying to create valid bindings for

mypy/checkpattern.py

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

mypy/checkstrformat.py

@@ -13,8 +13,8 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Callable, Dict, Match, Pattern, Tuple, Union, cast
-from typing_extensions import Final, TypeAlias as _TypeAlias
+from typing import TYPE_CHECKING, Callable, Dict, Final, Match, Pattern, Tuple, Union, cast
+from typing_extensions import TypeAlias as _TypeAlias
 
 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,
@@ -28,7 +29,7 @@
  Tuple,
  Union,
 )
-from typing_extensions import Final, TypeAlias as _TypeAlias
+from typing_extensions import TypeAlias as _TypeAlias
 
 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_extensions 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_extensions import Final
+from typing import TYPE_CHECKING, Final, Iterable, List, Sequence, cast
 
 import mypy.subtypes
 import mypy.typeops

mypy/defaults.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import os
-from typing_extensions import Final
+from typing import Final
 
 PYTHON2_VERSION: Final = (2, 7)
 

mypy/dmypy_server.py

@@ -17,8 +17,8 @@
 import time
 import traceback
 from contextlib import redirect_stderr, redirect_stdout
-from typing import AbstractSet, Any, Callable, List, Sequence, Tuple
-from typing_extensions import Final, TypeAlias as _TypeAlias
+from typing import AbstractSet, Any, Callable, Final, List, Sequence, Tuple
+from typing_extensions import TypeAlias as _TypeAlias
 
 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_extensions import Final
+from typing import Any, Final
 
 from mypy.ipc import IPCBase
 

mypy/errorcodes.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing_extensions import Final
+from typing import Final
 
 from mypy_extensions import mypyc_attr
 

mypy/errors.py

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

mypy/evalexpr.py

@@ -7,7 +7,7 @@
 
 """
 import ast
-from typing_extensions import Final
+from typing import Final
 
 import mypy.nodes
 from mypy.visitor import ExpressionVisitor

mypy/expandtype.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from typing import Iterable, Mapping, Sequence, TypeVar, cast, overload
-from typing_extensions 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,8 +4,8 @@
 import re
 import sys
 import warnings
-from typing import Any, Callable, List, Optional, Sequence, TypeVar, Union, cast
-from typing_extensions import Final, Literal, overload
+from typing import Any, Callable, Final, List, Optional, Sequence, TypeVar, Union, cast
+from typing_extensions import Literal, overload
 
 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_extensions import Final
+from typing import Final, Sequence
 
 from mypy.fscache import FileSystemCache
 from mypy.modulefinder import PYTHON_EXTENSIONS, BuildSource, matches_exclude, mypy_path
@@ -160,7 +159,7 @@ def crawl_up(self, path: str) -> tuple[str, str]:
  def crawl_up_dir(self, dir: str) -> tuple[str, str]:
  return self._crawl_up_helper(dir) or ("", dir)
 
- @functools.lru_cache() # noqa: B019
+ @functools.lru_cache # noqa: B019
  def _crawl_up_helper(self, dir: str) -> tuple[str, str] | None:
  """Given a directory, maybe returns module and base directory.
 

mypy/fixup.py

@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any
-from typing_extensions 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_extensions 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,7 +1,7 @@
 from __future__ import annotations
 
-from typing import Any, Iterable, Optional, Tuple
-from typing_extensions import Final, TypeAlias as _TypeAlias
+from typing import Any, Final, Iterable, Optional, Tuple
+from typing_extensions import TypeAlias as _TypeAlias
 
 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_extensions 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_extensions 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_extensions 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,8 +21,8 @@
 else:
  import tomli as tomllib
 
-from typing import Dict, List, NamedTuple, Optional, Tuple, Union
-from typing_extensions import Final, TypeAlias as _TypeAlias
+from typing import Dict, Final, List, NamedTuple, Optional, Tuple, Union
+from typing_extensions import TypeAlias as _TypeAlias
 
 from mypy import pyinfo
 from mypy.fscache import FileSystemCache

mypy/nodes.py

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

mypy/operators.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing_extensions import Final
+from typing import Final
 
 # Map from binary operator id to related method name (in Python 3).
 op_methods: Final = {

mypy/options.py

@@ -4,8 +4,7 @@
 import re
 import sys
 import sysconfig
-from typing import Any, Callable, Dict, Mapping, Pattern
-from typing_extensions import Final
+from typing import Any, Callable, Final, Mapping, Pattern
 
 from mypy import defaults
 from mypy.errorcodes import ErrorCode, error_codes
@@ -529,7 +528,7 @@ def compile_glob(self, s: str) -> Pattern[str]:
  return re.compile(expr + "\\Z")
 
  def select_options_affecting_cache(self) -> Mapping[str, object]:
- result: Dict[str, object] = {}
+ result: dict[str, object] = {}
  for opt in OPTIONS_AFFECTING_CACHE:
  val = getattr(self, opt)
  if opt in ("disabled_error_codes", "enabled_error_codes"):

mypy/plugins/attrs.py

@@ -4,8 +4,8 @@
 
 from collections import defaultdict
 from functools import reduce
-from typing import Iterable, List, Mapping, cast
-from typing_extensions import Final, Literal
+from typing import Final, Iterable, List, Mapping, cast
+from typing_extensions import Literal
 
 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_extensions 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
@@ -134,7 +133,7 @@ def to_argument(self, current_info: TypeInfo) -> Argument:
  kind=arg_kind,
  )
 
- def expand_type(self, current_info: TypeInfo) -> Optional[Type]:
+ def expand_type(self, current_info: TypeInfo) -> Type | None:
  if self.type is not None and self.info.self_type is not None:
  # In general, it is not safe to call `expand_type()` during semantic analyzis,
  # however this plugin is called very late, so all types should be fully ready.

mypy/plugins/enums.py

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