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

stdlib/@python2/optparse.pyi

@@ -1,9 +1,9 @@
-from typing import IO, Any, AnyStr, Callable, Dict, Iterable, List, Mapping, Sequence, Tuple, Type, Union, overload
+from typing import IO, Any, AnyStr, Callable, Iterable, Mapping, Sequence, Union, overload
 
 # See https://groups.google.com/forum/#!topic/python-ideas/gA1gdj3RZ5g
 _Text = Union[str, unicode]
 
-NO_DEFAULT: Tuple[_Text, ...]
+NO_DEFAULT: tuple[_Text, ...]
 SUPPRESS_HELP: _Text
 SUPPRESS_USAGE: _Text
 
@@ -42,7 +42,7 @@ class HelpFormatter:
     indent_increment: int
     level: int
     max_help_position: int
-    option_strings: Dict[Option, _Text]
+    option_strings: dict[Option, _Text]
     parser: OptionParser
     short_first: Any
     width: int
@@ -76,25 +76,25 @@ class TitledHelpFormatter(HelpFormatter):
     def format_usage(self, usage: _Text) -> _Text: ...
 
 class Option:
-    ACTIONS: Tuple[_Text, ...]
-    ALWAYS_TYPED_ACTIONS: Tuple[_Text, ...]
-    ATTRS: List[_Text]
-    CHECK_METHODS: List[Callable[..., Any]] | None
-    CONST_ACTIONS: Tuple[_Text, ...]
-    STORE_ACTIONS: Tuple[_Text, ...]
-    TYPED_ACTIONS: Tuple[_Text, ...]
-    TYPES: Tuple[_Text, ...]
-    TYPE_CHECKER: Dict[_Text, Callable[..., Any]]
-    _long_opts: List[_Text]
-    _short_opts: List[_Text]
+    ACTIONS: tuple[_Text, ...]
+    ALWAYS_TYPED_ACTIONS: tuple[_Text, ...]
+    ATTRS: list[_Text]
+    CHECK_METHODS: list[Callable[..., Any]] | None
+    CONST_ACTIONS: tuple[_Text, ...]
+    STORE_ACTIONS: tuple[_Text, ...]
+    TYPED_ACTIONS: tuple[_Text, ...]
+    TYPES: tuple[_Text, ...]
+    TYPE_CHECKER: dict[_Text, Callable[..., Any]]
+    _long_opts: list[_Text]
+    _short_opts: list[_Text]
     action: _Text
     dest: _Text | None
     default: Any
     nargs: int
     type: Any
     callback: Callable[..., Any] | None
-    callback_args: Tuple[Any, ...] | None
-    callback_kwargs: Dict[_Text, Any] | None
+    callback_args: tuple[Any, ...] | None
+    callback_kwargs: dict[_Text, Any] | None
     help: _Text | None
     metavar: _Text | None
     def __init__(self, *opts: _Text | None, **attrs: Any) -> None: ...
@@ -104,9 +104,9 @@ class Option:
     def _check_const(self) -> None: ...
     def _check_dest(self) -> None: ...
     def _check_nargs(self) -> None: ...
-    def _check_opt_strings(self, opts: Iterable[_Text | None]) -> List[_Text]: ...
+    def _check_opt_strings(self, opts: Iterable[_Text | None]) -> list[_Text]: ...
     def _check_type(self) -> None: ...
-    def _set_attrs(self, attrs: Dict[_Text, Any]) -> None: ...
+    def _set_attrs(self, attrs: dict[_Text, Any]) -> None: ...
     def _set_opt_strings(self, opts: Iterable[_Text]) -> None: ...
     def check_value(self, opt: _Text, value: Any) -> Any: ...
     def convert_value(self, opt: _Text, value: Any) -> Any: ...
@@ -118,13 +118,13 @@ class Option:
 make_option = Option
 
 class OptionContainer:
-    _long_opt: Dict[_Text, Option]
-    _short_opt: Dict[_Text, Option]
+    _long_opt: dict[_Text, Option]
+    _short_opt: dict[_Text, Option]
     conflict_handler: _Text
-    defaults: Dict[_Text, Any]
+    defaults: dict[_Text, Any]
     description: Any
-    option_class: Type[Option]
-    def __init__(self, option_class: Type[Option], conflict_handler: Any, description: Any) -> None: ...
+    option_class: type[Option]
+    def __init__(self, option_class: type[Option], conflict_handler: Any, description: Any) -> None: ...
     def _check_conflict(self, option: Any) -> None: ...
     def _create_option_mappings(self) -> None: ...
     def _share_option_mappings(self, parser: OptionParser) -> None: ...
@@ -145,7 +145,7 @@ class OptionContainer:
     def set_description(self, description: Any) -> None: ...
 
 class OptionGroup(OptionContainer):
-    option_list: List[Option]
+    option_list: list[Option]
     parser: OptionParser
     title: _Text
     def __init__(self, parser: OptionParser, title: _Text, description: _Text | None = ...) -> None: ...
@@ -167,13 +167,13 @@ class OptionParser(OptionContainer):
     allow_interspersed_args: bool
     epilog: _Text | None
     formatter: HelpFormatter
-    largs: List[_Text] | None
-    option_groups: List[OptionGroup]
-    option_list: List[Option]
+    largs: list[_Text] | None
+    option_groups: list[OptionGroup]
+    option_list: list[Option]
     process_default_values: Any
     prog: _Text | None
-    rargs: List[Any] | None
-    standard_option_list: List[Option]
+    rargs: list[Any] | None
+    standard_option_list: list[Option]
     usage: _Text | None
     values: Values | None
     version: _Text
@@ -181,7 +181,7 @@ class OptionParser(OptionContainer):
         self,
         usage: _Text | None = ...,
         option_list: Iterable[Option] | None = ...,
-        option_class: Type[Option] = ...,
+        option_class: type[Option] = ...,
         version: _Text | None = ...,
         conflict_handler: _Text = ...,
         description: _Text | None = ...,
@@ -193,19 +193,19 @@ class OptionParser(OptionContainer):
     def _add_help_option(self) -> None: ...
     def _add_version_option(self) -> None: ...
     def _create_option_list(self) -> None: ...
-    def _get_all_options(self) -> List[Option]: ...
-    def _get_args(self, args: Iterable[Any]) -> List[Any]: ...
+    def _get_all_options(self) -> list[Option]: ...
+    def _get_args(self, args: Iterable[Any]) -> list[Any]: ...
     def _init_parsing_state(self) -> None: ...
     def _match_long_opt(self, opt: _Text) -> _Text: ...
     def _populate_option_list(self, option_list: Iterable[Option], add_help: bool = ...) -> None: ...
-    def _process_args(self, largs: List[Any], rargs: List[Any], values: Values) -> None: ...
-    def _process_long_opt(self, rargs: List[Any], values: Any) -> None: ...
-    def _process_short_opts(self, rargs: List[Any], values: Any) -> None: ...
+    def _process_args(self, largs: list[Any], rargs: list[Any], values: Values) -> None: ...
+    def _process_long_opt(self, rargs: list[Any], values: Any) -> None: ...
+    def _process_short_opts(self, rargs: list[Any], values: Any) -> None: ...
     @overload
     def add_option_group(self, __opt_group: OptionGroup) -> OptionGroup: ...
     @overload
     def add_option_group(self, *args: Any, **kwargs: Any) -> OptionGroup: ...
-    def check_values(self, values: Values, args: List[_Text]) -> Tuple[Values, List[_Text]]: ...
+    def check_values(self, values: Values, args: list[_Text]) -> tuple[Values, list[_Text]]: ...
     def disable_interspersed_args(self) -> None: ...
     def enable_interspersed_args(self) -> None: ...
     def error(self, msg: _Text) -> None: ...
@@ -219,7 +219,7 @@ class OptionParser(OptionContainer):
     def get_prog_name(self) -> _Text: ...
     def get_usage(self) -> _Text: ...
     def get_version(self) -> _Text: ...
-    def parse_args(self, args: Sequence[AnyStr] | None = ..., values: Values | None = ...) -> Tuple[Values, List[AnyStr]]: ...
+    def parse_args(self, args: Sequence[AnyStr] | None = ..., values: Values | None = ...) -> tuple[Values, list[AnyStr]]: ...
     def print_usage(self, file: IO[str] | None = ...) -> None: ...
     def print_help(self, file: IO[str] | None = ...) -> None: ...
     def print_version(self, file: IO[str] | None = ...) -> None: ...