Use PEP 585 syntax wherever possible (#6717)

stdlib/email/_header_value_parser.pyi

@@ -1,7 +1,7 @@
 import sys
 from email.errors import HeaderParseError, MessageDefect
 from email.policy import Policy
-from typing import Any, Iterable, Iterator, List, Pattern, Type, TypeVar, Union
+from typing import Any, Iterable, Iterator, Pattern, Type, TypeVar, Union
 from typing_extensions import Final
 
 _T = TypeVar("_T")
@@ -23,7 +23,7 @@ def quote_string(value: Any) -> str: ...
 if sys.version_info >= (3, 7):
     rfc2047_matcher: Pattern[str]
 
-class TokenList(List[Union[TokenList, Terminal]]):
+class TokenList(list[Union[TokenList, Terminal]]):
     token_type: str | None
     syntactic_break: bool
     ew_combine_allowed: bool

stdlib/email/headerregistry.pyi

@@ -13,7 +13,7 @@ from email._header_value_parser import (
 )
 from email.errors import MessageDefect
 from email.policy import Policy
-from typing import Any, ClassVar, Tuple, Type
+from typing import Any, ClassVar, Type
 from typing_extensions import Literal
 
 class BaseHeader(str):
@@ -22,7 +22,7 @@ class BaseHeader(str):
     @property
     def name(self) -> str: ...
     @property
-    def defects(self) -> Tuple[MessageDefect, ...]: ...
+    def defects(self) -> tuple[MessageDefect, ...]: ...
     def __new__(cls, name: str, value: Any) -> BaseHeader: ...
     def init(self, name: str, *, parse_tree: TokenList, defects: Iterable[MessageDefect]) -> None: ...
     def fold(self, *, policy: Policy) -> str: ...
@@ -54,9 +54,9 @@ class AddressHeader:
     max_count: ClassVar[Literal[1] | None]
     def init(self, name: str, *, parse_tree: TokenList, defects: Iterable[MessageDefect], groups: Iterable[Group]) -> None: ...
     @property
-    def groups(self) -> Tuple[Group, ...]: ...
+    def groups(self) -> tuple[Group, ...]: ...
     @property
-    def addresses(self) -> Tuple[Address, ...]: ...
+    def addresses(self) -> tuple[Address, ...]: ...
     @staticmethod
     def value_parser(value: str) -> AddressList: ...
     @classmethod
@@ -165,6 +165,6 @@ class Group:
     @property
     def display_name(self) -> str | None: ...
     @property
-    def addresses(self) -> Tuple[Address, ...]: ...
+    def addresses(self) -> tuple[Address, ...]: ...
     def __init__(self, display_name: str | None = ..., addresses: Iterable[Address] | None = ...) -> None: ...
     def __str__(self) -> str: ...

stdlib/email/message.pyi

@@ -2,14 +2,14 @@ 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, List, Optional, Sequence, Tuple, TypeVar, Union
+from typing import Any, Generator, Iterator, Optional, Sequence, TypeVar, Union
 
 _T = TypeVar("_T")
 
-_PayloadType = Union[List[Message], str, bytes]
+_PayloadType = Union[list[Message], str, bytes]
 _CharsetType = Union[Charset, str, None]
-_ParamsType = Union[str, None, Tuple[str, Optional[str], str]]
-_ParamType = Union[str, Tuple[Optional[str], Optional[str], str]]
+_ParamsType = Union[str, None, tuple[str, Optional[str], str]]
+_ParamType = Union[str, tuple[Optional[str], Optional[str], str]]
 _HeaderType = Any
 
 class Message:

stdlib/email/mime/application.pyi

@@ -1,8 +1,8 @@
 from email.mime.nonmultipart import MIMENonMultipart
 from email.policy import Policy
-from typing import Callable, Optional, Tuple, Union
+from typing import Callable, Optional, Union
 
-_ParamsType = Union[str, None, Tuple[str, Optional[str], str]]
+_ParamsType = Union[str, None, tuple[str, Optional[str], str]]
 
 class MIMEApplication(MIMENonMultipart):
     def __init__(

stdlib/email/mime/audio.pyi

@@ -1,8 +1,8 @@
 from email.mime.nonmultipart import MIMENonMultipart
 from email.policy import Policy
-from typing import Callable, Optional, Tuple, Union
+from typing import Callable, Optional, Union
 
-_ParamsType = Union[str, None, Tuple[str, Optional[str], str]]
+_ParamsType = Union[str, None, tuple[str, Optional[str], str]]
 
 class MIMEAudio(MIMENonMultipart):
     def __init__(

stdlib/email/mime/base.pyi

@@ -1,8 +1,8 @@
 import email.message
 from email.policy import Policy
-from typing import Optional, Tuple, Union
+from typing import Optional, Union
 
-_ParamsType = Union[str, None, Tuple[str, Optional[str], str]]
+_ParamsType = Union[str, None, tuple[str, Optional[str], str]]
 
 class MIMEBase(email.message.Message):
     def __init__(self, _maintype: str, _subtype: str, *, policy: Policy | None = ..., **_params: _ParamsType) -> None: ...

stdlib/email/mime/image.pyi

@@ -1,8 +1,8 @@
 from email.mime.nonmultipart import MIMENonMultipart
 from email.policy import Policy
-from typing import Callable, Optional, Tuple, Union
+from typing import Callable, Optional, Union
 
-_ParamsType = Union[str, None, Tuple[str, Optional[str], str]]
+_ParamsType = Union[str, None, tuple[str, Optional[str], str]]
 
 class MIMEImage(MIMENonMultipart):
     def __init__(

stdlib/email/mime/multipart.pyi

@@ -1,9 +1,9 @@
 from email.message import Message
 from email.mime.base import MIMEBase
 from email.policy import Policy
-from typing import Optional, Sequence, Tuple, Union
+from typing import Optional, Sequence, Union
 
-_ParamsType = Union[str, None, Tuple[str, Optional[str], str]]
+_ParamsType = Union[str, None, tuple[str, Optional[str], str]]
 
 class MIMEMultipart(MIMEBase):
     def __init__(

stdlib/email/utils.pyi

@@ -1,10 +1,10 @@
 import datetime
 import sys
 from email.charset import Charset
-from typing import Optional, Tuple, Union, overload
+from typing import Optional, Union, overload
 
-_ParamType = Union[str, Tuple[Optional[str], Optional[str], str]]
-_PDTZ = Tuple[int, int, int, int, int, int, int, int, int, Optional[int]]
+_ParamType = Union[str, tuple[Optional[str], Optional[str], str]]
+_PDTZ = tuple[int, int, int, int, int, int, int, int, int, Optional[int]]
 
 def quote(str: str) -> str: ...
 def unquote(str: str) -> str: ...