Import from collections.abc wherever possible (#7635)

stdlib/email/__init__.pyi

@@ -1,6 +1,7 @@
+from collections.abc import Callable
 from email.message import Message
 from email.policy import Policy
-from typing import IO, Callable, TypeVar, Union
+from typing import IO, TypeVar, Union
 from typing_extensions import TypeAlias
 
 # Definitions imported by multiple submodules in typeshed

stdlib/email/_header_value_parser.pyi

@@ -1,8 +1,9 @@
 import sys
 from _typeshed import Self
+from collections.abc import Iterable, Iterator
 from email.errors import HeaderParseError, MessageDefect
 from email.policy import Policy
-from typing import Any, Iterable, Iterator, Pattern
+from typing import Any, Pattern
 from typing_extensions import Final
 
 WSP: Final[set[str]]

stdlib/email/charset.pyi

@@ -1,4 +1,4 @@
-from typing import Iterator
+from collections.abc import Iterator
 
 __all__ = ["Charset", "add_alias", "add_charset", "add_codec"]
 

stdlib/email/contentmanager.pyi

@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from email.message import Message
-from typing import Any, Callable
+from typing import Any
 
 class ContentManager:
     def __init__(self) -> None: ...

stdlib/email/feedparser.pyi

@@ -1,7 +1,8 @@
+from collections.abc import Callable
 from email import _MessageT
 from email.message import Message
 from email.policy import Policy
-from typing import Callable, Generic, overload
+from typing import Generic, overload
 
 __all__ = ["FeedParser", "BytesFeedParser"]
 

stdlib/email/iterators.pyi

@@ -1,6 +1,6 @@
 from _typeshed import SupportsWrite
+from collections.abc import Iterator
 from email.message import Message
-from typing import Iterator
 
 __all__ = ["body_line_iterator", "typed_subpart_iterator", "walk"]
 

stdlib/email/message.pyi

@@ -1,9 +1,10 @@
+from collections.abc import Generator, Iterator, Sequence
 from email import _ParamsType, _ParamType
 from email.charset import Charset
 from email.contentmanager import ContentManager
 from email.errors import MessageDefect
 from email.policy import Policy
-from typing import Any, Generator, Iterator, Sequence, TypeVar
+from typing import Any, TypeVar
 from typing_extensions import TypeAlias
 
 __all__ = ["Message", "EmailMessage"]

stdlib/email/parser.pyi

@@ -1,8 +1,9 @@
 import email.feedparser
+from collections.abc import Callable
 from email import _MessageT
 from email.message import Message
 from email.policy import Policy
-from typing import BinaryIO, Callable, TextIO
+from typing import BinaryIO, TextIO
 from typing_extensions import TypeAlias
 
 __all__ = ["Parser", "HeaderParser", "BytesParser", "BytesHeaderParser", "FeedParser", "BytesFeedParser"]

stdlib/email/policy.pyi

@@ -1,9 +1,10 @@
 from abc import ABCMeta, abstractmethod
+from collections.abc import Callable
 from email.contentmanager import ContentManager
 from email.errors import MessageDefect
 from email.header import Header
 from email.message import Message
-from typing import Any, Callable
+from typing import Any
 
 __all__ = ["Compat32", "compat32", "Policy", "EmailPolicy", "default", "strict", "SMTP", "HTTP"]