Use PEP 585 syntax in Python 2, protobuf & _ast stubs, where possible (#6949)

stdlib/@python2/distutils/ccompiler.pyi

@@ -1,11 +1,11 @@
-from typing import Any, Callable, List, Optional, Tuple, Union
+from typing import Any, Callable, Optional, Union
 
-_Macro = Union[Tuple[str], Tuple[str, Optional[str]]]
+_Macro = Union[tuple[str], tuple[str, Optional[str]]]
 
 def gen_lib_options(
-    compiler: CCompiler, library_dirs: List[str], runtime_library_dirs: List[str], libraries: List[str]
-) -> List[str]: ...
-def gen_preprocess_options(macros: List[_Macro], include_dirs: List[str]) -> List[str]: ...
+    compiler: CCompiler, library_dirs: list[str], runtime_library_dirs: list[str], libraries: list[str]
+) -> list[str]: ...
+def gen_preprocess_options(macros: list[_Macro], include_dirs: list[str]) -> list[str]: ...
 def get_default_compiler(osname: str | None = ..., platform: str | None = ...) -> str: ...
 def new_compiler(
     plat: str | None = ..., compiler: str | None = ..., verbose: int = ..., dry_run: int = ..., force: int = ...
@@ -17,34 +17,34 @@ class CCompiler:
     force: bool
     verbose: bool
     output_dir: str | None
-    macros: List[_Macro]
-    include_dirs: List[str]
-    libraries: List[str]
-    library_dirs: List[str]
-    runtime_library_dirs: List[str]
-    objects: List[str]
+    macros: list[_Macro]
+    include_dirs: list[str]
+    libraries: list[str]
+    library_dirs: list[str]
+    runtime_library_dirs: list[str]
+    objects: list[str]
     def __init__(self, verbose: int = ..., dry_run: int = ..., force: int = ...) -> None: ...
     def add_include_dir(self, dir: str) -> None: ...
-    def set_include_dirs(self, dirs: List[str]) -> None: ...
+    def set_include_dirs(self, dirs: list[str]) -> None: ...
     def add_library(self, libname: str) -> None: ...
-    def set_libraries(self, libnames: List[str]) -> None: ...
+    def set_libraries(self, libnames: list[str]) -> None: ...
     def add_library_dir(self, dir: str) -> None: ...
-    def set_library_dirs(self, dirs: List[str]) -> None: ...
+    def set_library_dirs(self, dirs: list[str]) -> None: ...
     def add_runtime_library_dir(self, dir: str) -> None: ...
-    def set_runtime_library_dirs(self, dirs: List[str]) -> None: ...
+    def set_runtime_library_dirs(self, dirs: list[str]) -> None: ...
     def define_macro(self, name: str, value: str | None = ...) -> None: ...
     def undefine_macro(self, name: str) -> None: ...
     def add_link_object(self, object: str) -> None: ...
-    def set_link_objects(self, objects: List[str]) -> None: ...
-    def detect_language(self, sources: str | List[str]) -> str | None: ...
-    def find_library_file(self, dirs: List[str], lib: str, debug: bool = ...) -> str | None: ...
+    def set_link_objects(self, objects: list[str]) -> None: ...
+    def detect_language(self, sources: str | list[str]) -> str | None: ...
+    def find_library_file(self, dirs: list[str], lib: str, debug: bool = ...) -> str | None: ...
     def has_function(
         self,
         funcname: str,
-        includes: List[str] | None = ...,
-        include_dirs: List[str] | None = ...,
-        libraries: List[str] | None = ...,
-        library_dirs: List[str] | None = ...,
+        includes: list[str] | None = ...,
+        include_dirs: list[str] | None = ...,
+        libraries: list[str] | None = ...,
+        library_dirs: list[str] | None = ...,
     ) -> bool: ...
     def library_dir_option(self, dir: str) -> str: ...
     def library_option(self, lib: str) -> str: ...
@@ -52,18 +52,18 @@ class CCompiler:
     def set_executables(self, **args: str) -> None: ...
     def compile(
         self,
-        sources: List[str],
+        sources: list[str],
         output_dir: str | None = ...,
         macros: _Macro | None = ...,
-        include_dirs: List[str] | None = ...,
+        include_dirs: list[str] | None = ...,
         debug: bool = ...,
-        extra_preargs: List[str] | None = ...,
-        extra_postargs: List[str] | None = ...,
-        depends: List[str] | None = ...,
-    ) -> List[str]: ...
+        extra_preargs: list[str] | None = ...,
+        extra_postargs: list[str] | None = ...,
+        depends: list[str] | None = ...,
+    ) -> list[str]: ...
     def create_static_lib(
         self,
-        objects: List[str],
+        objects: list[str],
         output_libname: str,
         output_dir: str | None = ...,
         debug: bool = ...,
@@ -72,59 +72,59 @@ class CCompiler:
     def link(
         self,
         target_desc: str,
-        objects: List[str],
+        objects: list[str],
         output_filename: str,
         output_dir: str | None = ...,
-        libraries: List[str] | None = ...,
-        library_dirs: List[str] | None = ...,
-        runtime_library_dirs: List[str] | None = ...,
-        export_symbols: List[str] | None = ...,
+        libraries: list[str] | None = ...,
+        library_dirs: list[str] | None = ...,
+        runtime_library_dirs: list[str] | None = ...,
+        export_symbols: list[str] | None = ...,
         debug: bool = ...,
-        extra_preargs: List[str] | None = ...,
-        extra_postargs: List[str] | None = ...,
+        extra_preargs: list[str] | None = ...,
+        extra_postargs: list[str] | None = ...,
         build_temp: str | None = ...,
         target_lang: str | None = ...,
     ) -> None: ...
     def link_executable(
         self,
-        objects: List[str],
+        objects: list[str],
         output_progname: str,
         output_dir: str | None = ...,
-        libraries: List[str] | None = ...,
-        library_dirs: List[str] | None = ...,
-        runtime_library_dirs: List[str] | None = ...,
+        libraries: list[str] | None = ...,
+        library_dirs: list[str] | None = ...,
+        runtime_library_dirs: list[str] | None = ...,
         debug: bool = ...,
-        extra_preargs: List[str] | None = ...,
-        extra_postargs: List[str] | None = ...,
+        extra_preargs: list[str] | None = ...,
+        extra_postargs: list[str] | None = ...,
         target_lang: str | None = ...,
     ) -> None: ...
     def link_shared_lib(
         self,
-        objects: List[str],
+        objects: list[str],
         output_libname: str,
         output_dir: str | None = ...,
-        libraries: List[str] | None = ...,
-        library_dirs: List[str] | None = ...,
-        runtime_library_dirs: List[str] | None = ...,
-        export_symbols: List[str] | None = ...,
+        libraries: list[str] | None = ...,
+        library_dirs: list[str] | None = ...,
+        runtime_library_dirs: list[str] | None = ...,
+        export_symbols: list[str] | None = ...,
         debug: bool = ...,
-        extra_preargs: List[str] | None = ...,
-        extra_postargs: List[str] | None = ...,
+        extra_preargs: list[str] | None = ...,
+        extra_postargs: list[str] | None = ...,
         build_temp: str | None = ...,
         target_lang: str | None = ...,
     ) -> None: ...
     def link_shared_object(
         self,
-        objects: List[str],
+        objects: list[str],
         output_filename: str,
         output_dir: str | None = ...,
-        libraries: List[str] | None = ...,
-        library_dirs: List[str] | None = ...,
-        runtime_library_dirs: List[str] | None = ...,
-        export_symbols: List[str] | None = ...,
+        libraries: list[str] | None = ...,
+        library_dirs: list[str] | None = ...,
+        runtime_library_dirs: list[str] | None = ...,
+        export_symbols: list[str] | None = ...,
         debug: bool = ...,
-        extra_preargs: List[str] | None = ...,
-        extra_postargs: List[str] | None = ...,
+        extra_preargs: list[str] | None = ...,
+        extra_postargs: list[str] | None = ...,
         build_temp: str | None = ...,
         target_lang: str | None = ...,
     ) -> None: ...
@@ -132,17 +132,17 @@ class CCompiler:
         self,
         source: str,
         output_file: str | None = ...,
-        macros: List[_Macro] | None = ...,
-        include_dirs: List[str] | None = ...,
-        extra_preargs: List[str] | None = ...,
-        extra_postargs: List[str] | None = ...,
+        macros: list[_Macro] | None = ...,
+        include_dirs: list[str] | None = ...,
+        extra_preargs: list[str] | None = ...,
+        extra_postargs: list[str] | None = ...,
     ) -> None: ...
     def executable_filename(self, basename: str, strip_dir: int = ..., output_dir: str = ...) -> str: ...
     def library_filename(self, libname: str, lib_type: str = ..., strip_dir: int = ..., output_dir: str = ...) -> str: ...
-    def object_filenames(self, source_filenames: List[str], strip_dir: int = ..., output_dir: str = ...) -> List[str]: ...
+    def object_filenames(self, source_filenames: list[str], strip_dir: int = ..., output_dir: str = ...) -> list[str]: ...
     def shared_object_filename(self, basename: str, strip_dir: int = ..., output_dir: str = ...) -> str: ...
-    def execute(self, func: Callable[..., None], args: Tuple[Any, ...], msg: str | None = ..., level: int = ...) -> None: ...
-    def spawn(self, cmd: List[str]) -> None: ...
+    def execute(self, func: Callable[..., None], args: tuple[Any, ...], msg: str | None = ..., level: int = ...) -> None: ...
+    def spawn(self, cmd: list[str]) -> None: ...
     def mkpath(self, name: str, mode: int = ...) -> None: ...
     def move_file(self, src: str, dst: str) -> str: ...
     def announce(self, msg: str, level: int = ...) -> None: ...

stdlib/@python2/distutils/cmd.pyi

@@ -1,9 +1,9 @@
 from abc import abstractmethod
 from distutils.dist import Distribution
-from typing import Any, Callable, Iterable, List, Text, Tuple
+from typing import Any, Callable, Iterable, Text
 
 class Command:
-    sub_commands: List[Tuple[str, Callable[[Command], bool] | None]]
+    sub_commands: list[tuple[str, Callable[[Command], bool] | None]]
     def __init__(self, dist: Distribution) -> None: ...
     @abstractmethod
     def initialize_options(self) -> None: ...
@@ -14,15 +14,15 @@ class Command:
     def announce(self, msg: Text, level: int = ...) -> None: ...
     def debug_print(self, msg: Text) -> None: ...
     def ensure_string(self, option: str, default: str | None = ...) -> None: ...
-    def ensure_string_list(self, option: str | List[str]) -> None: ...
+    def ensure_string_list(self, option: str | list[str]) -> None: ...
     def ensure_filename(self, option: str) -> None: ...
     def ensure_dirname(self, option: str) -> None: ...
     def get_command_name(self) -> str: ...
-    def set_undefined_options(self, src_cmd: Text, *option_pairs: Tuple[str, str]) -> None: ...
+    def set_undefined_options(self, src_cmd: Text, *option_pairs: tuple[str, str]) -> None: ...
     def get_finalized_command(self, command: Text, create: int = ...) -> Command: ...
     def reinitialize_command(self, command: Command | Text, reinit_subcommands: int = ...) -> Command: ...
     def run_command(self, command: Text) -> None: ...
-    def get_sub_commands(self) -> List[str]: ...
+    def get_sub_commands(self) -> list[str]: ...
     def warn(self, msg: Text) -> None: ...
     def execute(self, func: Callable[..., Any], args: Iterable[Any], msg: Text | None = ..., level: int = ...) -> None: ...
     def mkpath(self, name: str, mode: int = ...) -> None: ...
@@ -34,7 +34,7 @@ class Command:
         preserve_times: int = ...,
         link: str | None = ...,
         level: Any = ...,
-    ) -> Tuple[str, bool]: ...  # level is not used
+    ) -> tuple[str, bool]: ...  # level is not used
     def copy_tree(
         self,
         infile: str,
@@ -43,7 +43,7 @@ class Command:
         preserve_times: int = ...,
         preserve_symlinks: int = ...,
         level: Any = ...,
-    ) -> List[str]: ...  # level is not used
+    ) -> list[str]: ...  # level is not used
     def move_file(self, src: str, dst: str, level: Any = ...) -> str: ...  # level is not used
     def spawn(self, cmd: Iterable[str], search_path: int = ..., level: Any = ...) -> None: ...  # level is not used
     def make_archive(
@@ -57,10 +57,10 @@ class Command:
     ) -> str: ...
     def make_file(
         self,
-        infiles: str | List[str] | Tuple[str],
+        infiles: str | list[str] | tuple[str],
         outfile: str,
         func: Callable[..., Any],
-        args: List[Any],
+        args: list[Any],
         exec_msg: str | None = ...,
         skip_msg: str | None = ...,
         level: Any = ...,

stdlib/@python2/distutils/command/config.pyi

@@ -3,14 +3,14 @@ from distutils.ccompiler import CCompiler
 from distutils.core import Command as Command
 from distutils.errors import DistutilsExecError as DistutilsExecError
 from distutils.sysconfig import customize_compiler as customize_compiler
-from typing import Dict, List, Pattern, Sequence, Tuple
+from typing import Pattern, Sequence
 
-LANG_EXT: Dict[str, str]
+LANG_EXT: dict[str, str]
 
 class config(Command):
     description: str = ...
     # Tuple is full name, short name, description
-    user_options: Sequence[Tuple[str, str | None, str]] = ...
+    user_options: Sequence[tuple[str, str | None, str]] = ...
     compiler: str | CCompiler | None = ...
     cc: str | None = ...
     include_dirs: Sequence[str] | None = ...
@@ -74,7 +74,7 @@ class config(Command):
         library_dirs: Sequence[str] | None = ...,
         headers: Sequence[str] | None = ...,
         include_dirs: Sequence[str] | None = ...,
-        other_libraries: List[str] = ...,
+        other_libraries: list[str] = ...,
     ) -> bool: ...
     def check_header(
         self, header: str, include_dirs: Sequence[str] | None = ..., library_dirs: Sequence[str] | None = ..., lang: str = ...

stdlib/@python2/distutils/command/install_egg_info.pyi

@@ -1,10 +1,10 @@
 from distutils.cmd import Command
-from typing import ClassVar, List, Tuple
+from typing import ClassVar
 
 class install_egg_info(Command):
     description: ClassVar[str]
-    user_options: ClassVar[List[Tuple[str, str | None, str]]]
+    user_options: ClassVar[list[tuple[str, str | None, str]]]
     def initialize_options(self) -> None: ...
     def finalize_options(self) -> None: ...
     def run(self) -> None: ...
-    def get_outputs(self) -> List[str]: ...
+    def get_outputs(self) -> list[str]: ...

stdlib/@python2/distutils/command/upload.pyi

@@ -1,8 +1,8 @@
 from distutils.config import PyPIRCCommand
-from typing import ClassVar, List, Tuple
+from typing import ClassVar
 
 class upload(PyPIRCCommand):
     description: ClassVar[str]
-    boolean_options: ClassVar[List[str]]
+    boolean_options: ClassVar[list[str]]
     def run(self) -> None: ...
     def upload_file(self, command, pyversion, filename) -> None: ...

stdlib/@python2/distutils/config.pyi

@@ -1,6 +1,6 @@
 from abc import abstractmethod
 from distutils.cmd import Command
-from typing import ClassVar, List, Tuple
+from typing import ClassVar
 
 DEFAULT_PYPIRC: str
 
@@ -9,8 +9,8 @@ class PyPIRCCommand(Command):
     DEFAULT_REALM: ClassVar[str]
     repository: None
     realm: None
-    user_options: ClassVar[List[Tuple[str, str | None, str]]]
-    boolean_options: ClassVar[List[str]]
+    user_options: ClassVar[list[tuple[str, str | None, str]]]
+    boolean_options: ClassVar[list[str]]
     def initialize_options(self) -> None: ...
     def finalize_options(self) -> None: ...
     @abstractmethod

stdlib/@python2/distutils/core.pyi

@@ -1,7 +1,7 @@
 from distutils.cmd import Command as Command
 from distutils.dist import Distribution as Distribution
 from distutils.extension import Extension as Extension
-from typing import Any, List, Mapping, Tuple, Type
+from typing import Any, Mapping
 
 def setup(
     *,
@@ -15,34 +15,34 @@ def setup(
     maintainer_email: str = ...,
     url: str = ...,
     download_url: str = ...,
-    packages: List[str] = ...,
-    py_modules: List[str] = ...,
-    scripts: List[str] = ...,
-    ext_modules: List[Extension] = ...,
-    classifiers: List[str] = ...,
-    distclass: Type[Distribution] = ...,
+    packages: list[str] = ...,
+    py_modules: list[str] = ...,
+    scripts: list[str] = ...,
+    ext_modules: list[Extension] = ...,
+    classifiers: list[str] = ...,
+    distclass: type[Distribution] = ...,
     script_name: str = ...,
-    script_args: List[str] = ...,
+    script_args: list[str] = ...,
     options: Mapping[str, Any] = ...,
     license: str = ...,
-    keywords: List[str] | str = ...,
-    platforms: List[str] | str = ...,
-    cmdclass: Mapping[str, Type[Command]] = ...,
-    data_files: List[Tuple[str, List[str]]] = ...,
+    keywords: list[str] | str = ...,
+    platforms: list[str] | str = ...,
+    cmdclass: Mapping[str, type[Command]] = ...,
+    data_files: list[tuple[str, list[str]]] = ...,
     package_dir: Mapping[str, str] = ...,
-    obsoletes: List[str] = ...,
-    provides: List[str] = ...,
-    requires: List[str] = ...,
-    command_packages: List[str] = ...,
-    command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ...,
-    package_data: Mapping[str, List[str]] = ...,
+    obsoletes: list[str] = ...,
+    provides: list[str] = ...,
+    requires: list[str] = ...,
+    command_packages: list[str] = ...,
+    command_options: Mapping[str, Mapping[str, tuple[Any, Any]]] = ...,
+    package_data: Mapping[str, list[str]] = ...,
     include_package_data: bool = ...,
-    libraries: List[str] = ...,
-    headers: List[str] = ...,
+    libraries: list[str] = ...,
+    headers: list[str] = ...,
     ext_package: str = ...,
-    include_dirs: List[str] = ...,
+    include_dirs: list[str] = ...,
     password: str = ...,
     fullname: str = ...,
     **attrs: Any,
 ) -> None: ...
-def run_setup(script_name: str, script_args: List[str] | None = ..., stop_after: str = ...) -> Distribution: ...
+def run_setup(script_name: str, script_args: list[str] | None = ..., stop_after: str = ...) -> Distribution: ...

stdlib/@python2/distutils/dep_util.pyi

@@ -1,5 +1,3 @@
-from typing import List, Tuple
-
 def newer(source: str, target: str) -> bool: ...
-def newer_pairwise(sources: List[str], targets: List[str]) -> List[Tuple[str, str]]: ...
-def newer_group(sources: List[str], target: str, missing: str = ...) -> bool: ...
+def newer_pairwise(sources: list[str], targets: list[str]) -> list[tuple[str, str]]: ...
+def newer_group(sources: list[str], target: str, missing: str = ...) -> bool: ...

stdlib/@python2/distutils/dir_util.pyi

@@ -1,7 +1,5 @@
-from typing import List
-
-def mkpath(name: str, mode: int = ..., verbose: int = ..., dry_run: int = ...) -> List[str]: ...
-def create_tree(base_dir: str, files: List[str], mode: int = ..., verbose: int = ..., dry_run: int = ...) -> None: ...
+def mkpath(name: str, mode: int = ..., verbose: int = ..., dry_run: int = ...) -> list[str]: ...
+def create_tree(base_dir: str, files: list[str], mode: int = ..., verbose: int = ..., dry_run: int = ...) -> None: ...
 def copy_tree(
     src: str,
     dst: str,
@@ -11,5 +9,5 @@ def copy_tree(
     update: int = ...,
     verbose: int = ...,
     dry_run: int = ...,
-) -> List[str]: ...
+) -> list[str]: ...
 def remove_tree(directory: str, verbose: int = ..., dry_run: int = ...) -> None: ...

stdlib/@python2/distutils/dist.pyi

@@ -1,9 +1,9 @@
 from distutils.cmd import Command
-from typing import Any, Dict, Iterable, Mapping, Text, Tuple, Type
+from typing import Any, Iterable, Mapping, Text
 
 class Distribution:
-    cmdclass: Dict[str, Type[Command]]
+    cmdclass: dict[str, type[Command]]
     def __init__(self, attrs: Mapping[str, Any] | None = ...) -> None: ...
-    def get_option_dict(self, command: str) -> Dict[str, Tuple[str, Text]]: ...
+    def get_option_dict(self, command: str) -> dict[str, tuple[str, Text]]: ...
     def parse_config_files(self, filenames: Iterable[Text] | None = ...) -> None: ...
     def get_command_obj(self, command: str, create: bool = ...) -> Command | None: ...

stdlib/@python2/distutils/extension.pyi

@@ -1,21 +1,19 @@
-from typing import List, Tuple
-
 class Extension:
     def __init__(
         self,
         name: str,
-        sources: List[str],
-        include_dirs: List[str] = ...,
-        define_macros: List[Tuple[str, str | None]] = ...,
-        undef_macros: List[str] = ...,
-        library_dirs: List[str] = ...,
-        libraries: List[str] = ...,
-        runtime_library_dirs: List[str] = ...,
-        extra_objects: List[str] = ...,
-        extra_compile_args: List[str] = ...,
-        extra_link_args: List[str] = ...,
-        export_symbols: List[str] = ...,
+        sources: list[str],
+        include_dirs: list[str] = ...,
+        define_macros: list[tuple[str, str | None]] = ...,
+        undef_macros: list[str] = ...,
+        library_dirs: list[str] = ...,
+        libraries: list[str] = ...,
+        runtime_library_dirs: list[str] = ...,
+        extra_objects: list[str] = ...,
+        extra_compile_args: list[str] = ...,
+        extra_link_args: list[str] = ...,
+        export_symbols: list[str] = ...,
         swig_opts: str | None = ...,  # undocumented
-        depends: List[str] = ...,
+        depends: list[str] = ...,
         language: str = ...,
     ) -> None: ...

stdlib/@python2/distutils/fancy_getopt.pyi

@@ -1,21 +1,21 @@
-from typing import Any, List, Mapping, Optional, Tuple, overload
+from typing import Any, Mapping, Optional, overload
 
-_Option = Tuple[str, Optional[str], str]
-_GR = Tuple[List[str], OptionDummy]
+_Option = tuple[str, Optional[str], str]
+_GR = tuple[list[str], OptionDummy]
 
 def fancy_getopt(
-    options: List[_Option], negative_opt: Mapping[_Option, _Option], object: Any, args: List[str] | None
-) -> List[str] | _GR: ...
-def wrap_text(text: str, width: int) -> List[str]: ...
+    options: list[_Option], negative_opt: Mapping[_Option, _Option], object: Any, args: list[str] | None
+) -> list[str] | _GR: ...
+def wrap_text(text: str, width: int) -> list[str]: ...
 
 class FancyGetopt:
-    def __init__(self, option_table: List[_Option] | None = ...) -> None: ...
+    def __init__(self, option_table: list[_Option] | None = ...) -> None: ...
     # TODO kinda wrong, `getopt(object=object())` is invalid
     @overload
-    def getopt(self, args: List[str] | None = ...) -> _GR: ...
+    def getopt(self, args: list[str] | None = ...) -> _GR: ...
     @overload
-    def getopt(self, args: List[str] | None, object: Any) -> List[str]: ...
-    def get_option_order(self) -> List[Tuple[str, str]]: ...
-    def generate_help(self, header: str | None = ...) -> List[str]: ...
+    def getopt(self, args: list[str] | None, object: Any) -> list[str]: ...
+    def get_option_order(self) -> list[tuple[str, str]]: ...
+    def generate_help(self, header: str | None = ...) -> list[str]: ...
 
 class OptionDummy: ...

stdlib/@python2/distutils/file_util.pyi

@@ -1,4 +1,4 @@
-from typing import Sequence, Tuple
+from typing import Sequence
 
 def copy_file(
     src: str,
@@ -9,6 +9,6 @@ def copy_file(
     link: str | None = ...,
     verbose: bool = ...,
     dry_run: bool = ...,
-) -> Tuple[str, str]: ...
+) -> tuple[str, str]: ...
 def move_file(src: str, dst: str, verbose: bool = ..., dry_run: bool = ...) -> str: ...
 def write_file(filename: str, contents: Sequence[str]) -> None: ...

stdlib/@python2/distutils/spawn.pyi

@@ -1,4 +1,2 @@
-from typing import List
-
-def spawn(cmd: List[str], search_path: bool = ..., verbose: bool = ..., dry_run: bool = ...) -> None: ...
+def spawn(cmd: list[str], search_path: bool = ..., verbose: bool = ..., dry_run: bool = ...) -> None: ...
 def find_executable(executable: str, path: str | None = ...) -> str | None: ...

stdlib/@python2/distutils/text_file.pyi

@@ -1,4 +1,4 @@
-from typing import IO, List, Tuple
+from typing import IO
 
 class TextFile:
     def __init__(
@@ -15,7 +15,7 @@ class TextFile:
     ) -> None: ...
     def open(self, filename: str) -> None: ...
     def close(self) -> None: ...
-    def warn(self, msg: str, line: List[int] | Tuple[int, int] | int = ...) -> None: ...
+    def warn(self, msg: str, line: list[int] | tuple[int, int] | int = ...) -> None: ...
     def readline(self) -> str | None: ...
-    def readlines(self) -> List[str]: ...
+    def readlines(self) -> list[str]: ...
     def unreadline(self, line: str) -> str: ...

stdlib/@python2/distutils/util.pyi

@@ -1,17 +1,17 @@
-from typing import Any, Callable, List, Mapping, Tuple
+from typing import Any, Callable, Mapping
 
 def get_platform() -> str: ...
 def convert_path(pathname: str) -> str: ...
 def change_root(new_root: str, pathname: str) -> str: ...
 def check_environ() -> None: ...
 def subst_vars(s: str, local_vars: Mapping[str, str]) -> None: ...
-def split_quoted(s: str) -> List[str]: ...
+def split_quoted(s: str) -> list[str]: ...
 def execute(
-    func: Callable[..., None], args: Tuple[Any, ...], msg: str | None = ..., verbose: bool = ..., dry_run: bool = ...
+    func: Callable[..., None], args: tuple[Any, ...], msg: str | None = ..., verbose: bool = ..., dry_run: bool = ...
 ) -> None: ...
 def strtobool(val: str) -> bool: ...
 def byte_compile(
-    py_files: List[str],
+    py_files: list[str],
     optimize: int = ...,
     force: bool = ...,
     prefix: str | None = ...,

stdlib/@python2/distutils/version.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Self
 from abc import abstractmethod
-from typing import Pattern, Text, Tuple, TypeVar
+from typing import Pattern, Text, TypeVar
 
 _T = TypeVar("_T", bound=Version)
 
@@ -17,8 +17,8 @@ class Version:
 
 class StrictVersion(Version):
     version_re: Pattern[str]
-    version: Tuple[int, int, int]
-    prerelease: Tuple[Text, int] | None
+    version: tuple[int, int, int]
+    prerelease: tuple[Text, int] | None
     def __init__(self, vstring: Text | None = ...) -> None: ...
     def parse(self: Self, vstring: Text) -> Self: ...
     def __str__(self) -> str: ...
@@ -27,7 +27,7 @@ class StrictVersion(Version):
 class LooseVersion(Version):
     component_re: Pattern[str]
     vstring: Text
-    version: Tuple[Text | int, ...]
+    version: tuple[Text | int, ...]
     def __init__(self, vstring: Text | None = ...) -> None: ...
     def parse(self: Self, vstring: Text) -> Self: ...
     def __str__(self) -> str: ...