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

stubs/protobuf/google/protobuf/internal/containers.pyi

@@ -1,5 +1,5 @@
 from collections.abc import MutableMapping
-from typing import Any, Callable, Iterable, Iterator, List, Optional, Sequence, Text, TypeVar, Union, overload
+from typing import Any, Callable, Iterable, Iterator, Optional, Sequence, Text, TypeVar, Union, overload
 from typing_extensions import SupportsIndex
 
 from google.protobuf.descriptor import Descriptor
@@ -23,7 +23,7 @@ class BaseContainer(Sequence[_T]):
     @overload
     def __getitem__(self, key: SupportsIndex) -> _T: ...
     @overload
-    def __getitem__(self, key: slice) -> List[_T]: ...
+    def __getitem__(self, key: slice) -> list[_T]: ...
 
 class RepeatedScalarFieldContainer(BaseContainer[_ScalarV]):
     def __init__(self, message_listener: MessageListener, message_descriptor: Descriptor) -> None: ...
@@ -37,7 +37,7 @@ class RepeatedScalarFieldContainer(BaseContainer[_ScalarV]):
     def __setitem__(self, key: int, value: _ScalarV) -> None: ...
     @overload
     def __setitem__(self, key: slice, value: Iterable[_ScalarV]) -> None: ...
-    def __getslice__(self, start: int, stop: int) -> List[_ScalarV]: ...
+    def __getslice__(self, start: int, stop: int) -> list[_ScalarV]: ...
     def __setslice__(self, start: int, stop: int, values: Iterable[_ScalarV]) -> None: ...
     def __delitem__(self, key: Union[int, slice]) -> None: ...
     def __delslice__(self, start: int, stop: int) -> None: ...
@@ -52,7 +52,7 @@ class RepeatedCompositeFieldContainer(BaseContainer[_MessageV]):
     def MergeFrom(self: _M, other: _M) -> None: ...
     def remove(self, elem: _MessageV) -> None: ...
     def pop(self, key: int = ...) -> _MessageV: ...
-    def __getslice__(self, start: int, stop: int) -> List[_MessageV]: ...
+    def __getslice__(self, start: int, stop: int) -> list[_MessageV]: ...
     def __delitem__(self, key: Union[int, slice]) -> None: ...
     def __delslice__(self, start: int, stop: int) -> None: ...
     def __eq__(self, other: object) -> bool: ...

stubs/protobuf/google/protobuf/internal/enum_type_wrapper.pyi

@@ -1,4 +1,4 @@
-from typing import Generic, List, Text, Tuple, TypeVar
+from typing import Generic, Text, TypeVar
 
 from google.protobuf.descriptor import EnumDescriptor
 
@@ -11,8 +11,8 @@ class _EnumTypeWrapper(Generic[_V]):
     def __init__(self, enum_type: EnumDescriptor) -> None: ...
     def Name(self, number: _V) -> str: ...
     def Value(self, name: Text | bytes) -> _V: ...
-    def keys(self) -> List[str]: ...
-    def values(self) -> List[_V]: ...
-    def items(self) -> List[Tuple[str, _V]]: ...
+    def keys(self) -> list[str]: ...
+    def values(self) -> list[_V]: ...
+    def items(self) -> list[tuple[str, _V]]: ...
 
 class EnumTypeWrapper(_EnumTypeWrapper[int]): ...

stubs/protobuf/google/protobuf/internal/well_known_types.pyi

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta
-from typing import Any as tAny, Dict, Optional, Type
+from typing import Any as tAny, Optional
 
 class Error(Exception): ...
 class ParseError(Error): ...
@@ -91,4 +91,4 @@ class ListValue:
     def add_struct(self): ...
     def add_list(self): ...
 
-WKTBASES: Dict[str, Type[tAny]]
+WKTBASES: dict[str, type[tAny]]

stubs/protobuf/google/protobuf/json_format.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional, Text, TypeVar, Union
+from typing import Any, Optional, Text, TypeVar, Union
 
 from google.protobuf.descriptor_pool import DescriptorPool
 from google.protobuf.message import Message
@@ -26,7 +26,7 @@ def MessageToDict(
     use_integers_for_enums: bool = ...,
     descriptor_pool: Optional[DescriptorPool] = ...,
     float_precision: Optional[int] = ...,
-) -> Dict[Text, Any]: ...
+) -> dict[Text, Any]: ...
 def Parse(
     text: Union[bytes, Text],
     message: _MessageT,

stubs/protobuf/google/protobuf/message.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Sequence, Tuple, Type, TypeVar
+from typing import Any, Sequence, TypeVar
 
 from .descriptor import Descriptor, FieldDescriptor
 from .internal.extension_dict import _ExtensionDict, _ExtensionFieldDescriptor
@@ -23,12 +23,12 @@ class Message:
     def ParseFromString(self, serialized: bytes) -> int: ...
     def SerializeToString(self, deterministic: bool = ...) -> bytes: ...
     def SerializePartialToString(self, deterministic: bool = ...) -> bytes: ...
-    def ListFields(self) -> Sequence[Tuple[FieldDescriptor, Any]]: ...
+    def ListFields(self) -> Sequence[tuple[FieldDescriptor, Any]]: ...
     def HasExtension(self: _M, extension_handle: _ExtensionFieldDescriptor[_M, Any]) -> bool: ...
     def ClearExtension(self: _M, extension_handle: _ExtensionFieldDescriptor[_M, Any]) -> None: ...
     def ByteSize(self) -> int: ...
     @classmethod
-    def FromString(cls: Type[_M], s: bytes) -> _M: ...
+    def FromString(cls: type[_M], s: bytes) -> _M: ...
     @property
     def Extensions(self: _M) -> _ExtensionDict[_M]: ...
     # Intentionally left out typing on these three methods, because they are

stubs/protobuf/google/protobuf/message_factory.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Iterable, Optional, Type
+from typing import Any, Iterable, Optional
 
 from google.protobuf.descriptor import Descriptor
 from google.protobuf.descriptor_pb2 import FileDescriptorProto
@@ -8,7 +8,7 @@ from google.protobuf.message import Message
 class MessageFactory:
     pool: Any
     def __init__(self, pool: Optional[DescriptorPool] = ...) -> None: ...
-    def GetPrototype(self, descriptor: Descriptor) -> Type[Message]: ...
-    def GetMessages(self, files: Iterable[str]) -> Dict[str, Type[Message]]: ...
+    def GetPrototype(self, descriptor: Descriptor) -> type[Message]: ...
+    def GetMessages(self, files: Iterable[str]) -> dict[str, type[Message]]: ...
 
-def GetMessages(file_protos: Iterable[FileDescriptorProto]) -> Dict[str, Type[Message]]: ...
+def GetMessages(file_protos: Iterable[FileDescriptorProto]) -> dict[str, type[Message]]: ...

stubs/protobuf/google/protobuf/service.pyi

@@ -1,5 +1,5 @@
 from concurrent.futures import Future
-from typing import Callable, Optional, Text, Type
+from typing import Callable, Optional, Text
 
 from google.protobuf.descriptor import MethodDescriptor, ServiceDescriptor
 from google.protobuf.message import Message
@@ -16,8 +16,8 @@ class Service:
         request: Message,
         done: Optional[Callable[[Message], None]],
     ) -> Optional[Future[Message]]: ...
-    def GetRequestClass(self, method_descriptor: MethodDescriptor) -> Type[Message]: ...
-    def GetResponseClass(self, method_descriptor: MethodDescriptor) -> Type[Message]: ...
+    def GetRequestClass(self, method_descriptor: MethodDescriptor) -> type[Message]: ...
+    def GetResponseClass(self, method_descriptor: MethodDescriptor) -> type[Message]: ...
 
 class RpcController:
     def Reset(self) -> None: ...
@@ -34,6 +34,6 @@ class RpcChannel:
         method_descriptor: MethodDescriptor,
         rpc_controller: RpcController,
         request: Message,
-        response_class: Type[Message],
+        response_class: type[Message],
         done: Optional[Callable[[Message], None]],
     ) -> Optional[Future[Message]]: ...

stubs/protobuf/google/protobuf/symbol_database.pyi

@@ -1,16 +1,16 @@
-from typing import Dict, Iterable, Type, Union
+from typing import Iterable, Union
 
 from google.protobuf.descriptor import Descriptor, EnumDescriptor, FileDescriptor, ServiceDescriptor
 from google.protobuf.message import Message
 from google.protobuf.message_factory import MessageFactory
 
 class SymbolDatabase(MessageFactory):
-    def RegisterMessage(self, message: Union[Type[Message], Message]) -> Union[Type[Message], Message]: ...
+    def RegisterMessage(self, message: Union[type[Message], Message]) -> Union[type[Message], Message]: ...
     def RegisterMessageDescriptor(self, message_descriptor: Descriptor) -> None: ...
     def RegisterEnumDescriptor(self, enum_descriptor: EnumDescriptor) -> EnumDescriptor: ...
     def RegisterServiceDescriptor(self, service_descriptor: ServiceDescriptor) -> None: ...
     def RegisterFileDescriptor(self, file_descriptor: FileDescriptor) -> None: ...
-    def GetSymbol(self, symbol: str) -> Type[Message]: ...
-    def GetMessages(self, files: Iterable[str]) -> Dict[str, Type[Message]]: ...
+    def GetSymbol(self, symbol: str) -> type[Message]: ...
+    def GetMessages(self, files: Iterable[str]) -> dict[str, type[Message]]: ...
 
 def Default(): ...

stubs/protobuf/google/protobuf/text_format.pyi

@@ -1,5 +1,5 @@
 from _typeshed import SupportsWrite
-from typing import Any, Callable, Iterable, Optional, Text, Tuple, TypeVar, Union
+from typing import Any, Callable, Iterable, Optional, Text, TypeVar, Union
 
 from .descriptor import FieldDescriptor
 from .descriptor_pool import DescriptorPool
@@ -190,7 +190,7 @@ class Tokenizer:
     def TryConsume(self, token: str) -> bool: ...
     def Consume(self, token: str) -> None: ...
     def ConsumeComment(self) -> str: ...
-    def ConsumeCommentOrTrailingComment(self) -> Tuple[bool, str]: ...
+    def ConsumeCommentOrTrailingComment(self) -> tuple[bool, str]: ...
     def TryConsumeIdentifier(self) -> bool: ...
     def ConsumeIdentifier(self) -> str: ...
     def TryConsumeIdentifierOrNumber(self) -> bool: ...