Third-party stubs: import from collections.abc where possible (#7637)

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

@@ -1,5 +1,5 @@
-from collections.abc import MutableMapping
-from typing import Any, Callable, Iterable, Iterator, Sequence, Text, TypeVar, overload
+from collections.abc import Callable, Iterable, Iterator, MutableMapping, Sequence
+from typing import Any, Text, TypeVar, overload
 from typing_extensions import SupportsIndex
 
 from google.protobuf.descriptor import Descriptor

stubs/protobuf/google/protobuf/internal/decoder.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 from typing_extensions import TypeAlias
 
 from google.protobuf.descriptor import Descriptor, FieldDescriptor

stubs/protobuf/google/protobuf/internal/encoder.pyi

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 from typing_extensions import TypeAlias
 
 from google.protobuf.descriptor import FieldDescriptor

stubs/protobuf/google/protobuf/internal/extension_dict.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Generic, Iterator, Text, TypeVar
+from collections.abc import Iterator
+from typing import Any, Generic, Text, TypeVar
 
 from google.protobuf.descriptor import FieldDescriptor
 from google.protobuf.internal.containers import RepeatedCompositeFieldContainer, RepeatedScalarFieldContainer

stubs/protobuf/google/protobuf/message.pyi

@@ -1,5 +1,6 @@
 from _typeshed import Self
-from typing import Any, Sequence, TypeVar
+from collections.abc import Sequence
+from typing import Any, TypeVar
 
 from .descriptor import Descriptor, FieldDescriptor
 from .internal.extension_dict import _ExtensionDict, _ExtensionFieldDescriptor

stubs/protobuf/google/protobuf/message_factory.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Iterable
+from collections.abc import Iterable
+from typing import Any
 
 from google.protobuf.descriptor import Descriptor
 from google.protobuf.descriptor_pb2 import FileDescriptorProto

stubs/protobuf/google/protobuf/service.pyi

@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from concurrent.futures import Future
-from typing import Callable, Text
+from typing import Text
 
 from google.protobuf.descriptor import MethodDescriptor, ServiceDescriptor
 from google.protobuf.message import Message

stubs/protobuf/google/protobuf/symbol_database.pyi

@@ -1,4 +1,4 @@
-from typing import Iterable
+from collections.abc import Iterable
 
 from google.protobuf.descriptor import Descriptor, EnumDescriptor, FileDescriptor, ServiceDescriptor
 from google.protobuf.message import Message

stubs/protobuf/google/protobuf/text_format.pyi

@@ -1,5 +1,6 @@
 from _typeshed import SupportsWrite
-from typing import Any, Callable, Iterable, Text, TypeVar
+from collections.abc import Callable, Iterable
+from typing import Any, Text, TypeVar
 from typing_extensions import TypeAlias
 
 from .descriptor import FieldDescriptor