Use PEP 604 syntax wherever possible, part II (#7514)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Author: AlexWaygood

stdlib/@python2/calendar.pyi

@@ -1,8 +1,8 @@
 import datetime
 from time import struct_time
-from typing import Any, Iterable, Optional, Sequence
+from typing import Any, Iterable, Sequence
 
-_LocaleType = tuple[Optional[str], Optional[str]]
+_LocaleType = tuple[str | None, str | None]
 
 class IllegalMonthError(ValueError):
     def __init__(self, month: int) -> None: ...

stdlib/@python2/copy_reg.pyi

@@ -1,7 +1,7 @@
-from typing import Any, Callable, Hashable, Optional, SupportsInt, TypeVar, Union
+from typing import Any, Callable, Hashable, SupportsInt, TypeVar, Union
 
 _TypeT = TypeVar("_TypeT", bound=type)
-_Reduce = Union[tuple[Callable[..., _TypeT], tuple[Any, ...]], tuple[Callable[..., _TypeT], tuple[Any, ...], Optional[Any]]]
+_Reduce = Union[tuple[Callable[..., _TypeT], tuple[Any, ...]], tuple[Callable[..., _TypeT], tuple[Any, ...], Any | None]]
 
 __all__ = ["pickle", "constructor", "add_extension", "remove_extension", "clear_extension_cache"]
 

stdlib/@python2/copyreg.pyi

@@ -1,7 +1,7 @@
-from typing import Any, Callable, Hashable, Optional, SupportsInt, TypeVar, Union
+from typing import Any, Callable, Hashable, SupportsInt, TypeVar, Union
 
 _TypeT = TypeVar("_TypeT", bound=type)
-_Reduce = Union[tuple[Callable[..., _TypeT], tuple[Any, ...]], tuple[Callable[..., _TypeT], tuple[Any, ...], Optional[Any]]]
+_Reduce = Union[tuple[Callable[..., _TypeT], tuple[Any, ...]], tuple[Callable[..., _TypeT], tuple[Any, ...], Any | None]]
 
 __all__ = ["pickle", "constructor", "add_extension", "remove_extension", "clear_extension_cache"]
 

stdlib/@python2/ctypes/__init__.pyi

@@ -9,7 +9,6 @@ from typing import (
     Iterable,
     Iterator,
     Mapping,
-    Optional,
     Sequence,
     Text,
     TypeVar,
@@ -88,7 +87,7 @@ class _CData(metaclass=_CDataMeta):
 class _CanCastTo(_CData): ...
 class _PointerLike(_CanCastTo): ...
 
-_ECT = Callable[[Optional[type[_CData]], _FuncPointer, tuple[_CData, ...]], _CData]
+_ECT = Callable[[type[_CData] | None, _FuncPointer, tuple[_CData, ...]], _CData]
 _PF = _UnionT[tuple[int], tuple[int, str], tuple[int, str, Any]]
 
 class _FuncPointer(_PointerLike, _CData):

stdlib/@python2/distutils/ccompiler.pyi

@@ -1,6 +1,6 @@
-from typing import Any, Callable, Optional, Union
+from typing import Any, Callable, Union
 
-_Macro = Union[tuple[str], tuple[str, Optional[str]]]
+_Macro = Union[tuple[str], tuple[str, str | None]]
 
 def gen_lib_options(
     compiler: CCompiler, library_dirs: list[str], runtime_library_dirs: list[str], libraries: list[str]

stdlib/@python2/distutils/fancy_getopt.pyi

@@ -1,6 +1,6 @@
-from typing import Any, Mapping, Optional, overload
+from typing import Any, Mapping, overload
 
-_Option = tuple[str, Optional[str], str]
+_Option = tuple[str, str | None, str]
 _GR = tuple[list[str], OptionDummy]
 
 def fancy_getopt(

stdlib/@python2/email/mime/application.pyi

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

stdlib/@python2/imaplib.pyi

@@ -3,14 +3,14 @@ import time
 from builtins import list as List  # alias to avoid name clashes with `IMAP4.list`
 from socket import socket as _socket
 from ssl import SSLSocket
-from typing import IO, Any, Callable, Pattern, Text, Union
+from typing import IO, Any, Callable, Pattern, Text
 from typing_extensions import Literal
 
 # TODO: Commands should use their actual return types, not this type alias.
 #       E.g. tuple[Literal["OK"], list[bytes]]
 _CommandResults = tuple[str, list[Any]]
 
-_AnyResponseData = Union[list[None], list[Union[bytes, tuple[bytes, bytes]]]]
+_AnyResponseData = list[None] | list[bytes | tuple[bytes, bytes]]
 
 class IMAP4:
     error: type[Exception] = ...

stdlib/@python2/inspect.pyi

@@ -1,5 +1,5 @@
 from types import CodeType, FrameType, FunctionType, MethodType, ModuleType, TracebackType
-from typing import Any, AnyStr, Callable, NamedTuple, Optional, Sequence, Union
+from typing import Any, AnyStr, Callable, NamedTuple, Sequence, Union
 
 # Types and members
 class EndOfBlock(Exception): ...
@@ -106,7 +106,7 @@ class Traceback(NamedTuple):
     code_context: list[str] | None
     index: int | None  # type: ignore[assignment]
 
-_FrameInfo = tuple[FrameType, str, int, str, Optional[list[str]], Optional[int]]
+_FrameInfo = tuple[FrameType, str, int, str, list[str] | None, int | None]
 
 def getouterframes(frame: FrameType, context: int = ...) -> list[_FrameInfo]: ...
 def getframeinfo(frame: FrameType | TracebackType, context: int = ...) -> Traceback: ...

stdlib/@python2/lib2to3/pgen2/grammar.pyi

@@ -1,7 +1,7 @@
 from _typeshed import Self, StrPath
-from typing import Optional, Text
+from typing import Text
 
-_Label = tuple[int, Optional[Text]]
+_Label = tuple[int, Text | None]
 _DFA = list[list[tuple[int, int]]]
 _DFAS = tuple[_DFA, dict[int, int]]