Switch to PEP-604 syntax in python2 stubs (#5915)

Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>

stdlib/@python2/logging/__init__.pyi

@@ -14,11 +14,11 @@ raiseExceptions: bool
 logThreads: bool
 logMultiprocessing: bool
 logProcesses: bool
-_srcfile: Optional[str]
+_srcfile: str | None
 
 def currentframe() -> FrameType: ...
 
-_levelNames: Dict[Union[int, str], Union[str, int]]  # Union[int:str, str:int]
+_levelNames: Dict[int | str, str | int]  # Union[int:str, str:int]
 
 class Filterer(object):
     filters: List[Filter]
@@ -30,7 +30,7 @@ class Filterer(object):
 class Logger(Filterer):
     name: str
     level: int
-    parent: Union[Logger, PlaceHolder]
+    parent: Logger | PlaceHolder
     propagate: bool
     handlers: List[Handler]
     disabled: int
@@ -40,30 +40,30 @@ class Logger(Filterer):
     def getEffectiveLevel(self) -> int: ...
     def getChild(self, suffix: str) -> Logger: ...
     def debug(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def info(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def warning(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     warn = warning
     def error(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def critical(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     fatal = critical
     def log(
-        self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def exception(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def _log(
-        self, level: int, msg: Any, args: _ArgsType, exc_info: Optional[_ExcInfoType] = ..., extra: Optional[Dict[str, Any]] = ...
+        self, level: int, msg: Any, args: _ArgsType, exc_info: _ExcInfoType | None = ..., extra: Dict[str, Any] | None = ...
     ) -> None: ...  # undocumented
     def filter(self, record: LogRecord) -> bool: ...
     def addHandler(self, hdlr: Handler) -> None: ...
@@ -78,9 +78,9 @@ class Logger(Filterer):
         lno: int,
         msg: Any,
         args: _ArgsType,
-        exc_info: Optional[_SysExcInfoType],
-        func: Optional[str] = ...,
-        extra: Optional[Mapping[str, Any]] = ...,
+        exc_info: _SysExcInfoType | None,
+        func: str | None = ...,
+        extra: Mapping[str, Any] | None = ...,
     ) -> LogRecord: ...
 
 CRITICAL: int
@@ -94,9 +94,9 @@ NOTSET: int
 
 class Handler(Filterer):
     level: int  # undocumented
-    formatter: Optional[Formatter]  # undocumented
-    lock: Optional[threading.Lock]  # undocumented
-    name: Optional[str]  # undocumented
+    formatter: Formatter | None  # undocumented
+    lock: threading.Lock | None  # undocumented
+    name: str | None  # undocumented
     def __init__(self, level: _Level = ...) -> None: ...
     def createLock(self) -> None: ...
     def acquire(self) -> None: ...
@@ -112,12 +112,12 @@ class Handler(Filterer):
     def emit(self, record: LogRecord) -> None: ...
 
 class Formatter:
-    converter: Callable[[Optional[float]], struct_time]
-    _fmt: Optional[str]
-    datefmt: Optional[str]
-    def __init__(self, fmt: Optional[str] = ..., datefmt: Optional[str] = ...) -> None: ...
+    converter: Callable[[float | None], struct_time]
+    _fmt: str | None
+    datefmt: str | None
+    def __init__(self, fmt: str | None = ..., datefmt: str | None = ...) -> None: ...
     def format(self, record: LogRecord) -> str: ...
-    def formatTime(self, record: LogRecord, datefmt: Optional[str] = ...) -> str: ...
+    def formatTime(self, record: LogRecord, datefmt: str | None = ...) -> str: ...
     def formatException(self, ei: _SysExcInfoType) -> str: ...
 
 class Filter:
@@ -128,8 +128,8 @@ class LogRecord:
     args: _ArgsType
     asctime: str
     created: int
-    exc_info: Optional[_SysExcInfoType]
-    exc_text: Optional[str]
+    exc_info: _SysExcInfoType | None
+    exc_text: str | None
     filename: str
     funcName: str
     levelname: str
@@ -154,8 +154,8 @@ class LogRecord:
         lineno: int,
         msg: Any,
         args: _ArgsType,
-        exc_info: Optional[_SysExcInfoType],
-        func: Optional[str] = ...,
+        exc_info: _SysExcInfoType | None,
+        func: str | None = ...,
     ) -> None: ...
     def getMessage(self) -> str: ...
 
@@ -165,66 +165,62 @@ class LoggerAdapter:
     def __init__(self, logger: Logger, extra: Mapping[str, Any]) -> None: ...
     def process(self, msg: Any, kwargs: MutableMapping[str, Any]) -> Tuple[Any, MutableMapping[str, Any]]: ...
     def debug(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def info(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def warning(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def error(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def exception(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def critical(
-        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def log(
-        self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+        self, level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
     ) -> None: ...
     def isEnabledFor(self, level: int) -> bool: ...
 
 @overload
 def getLogger() -> Logger: ...
 @overload
-def getLogger(name: Union[Text, str]) -> Logger: ...
+def getLogger(name: Text | str) -> Logger: ...
 def getLoggerClass() -> type: ...
-def debug(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
-def info(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
-def warning(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
+def debug(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any) -> None: ...
+def info(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any) -> None: ...
+def warning(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any) -> None: ...
 
 warn = warning
 
-def error(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
-def critical(
-    msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
-) -> None: ...
-def exception(
-    msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
-) -> None: ...
+def error(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any) -> None: ...
+def critical(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any) -> None: ...
+def exception(msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any) -> None: ...
 def log(
-    level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Optional[Dict[str, Any]] = ..., **kwargs: Any
+    level: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ..., extra: Dict[str, Any] | None = ..., **kwargs: Any
 ) -> None: ...
 
 fatal = critical
 
 def disable(level: int) -> None: ...
 def addLevelName(level: int, levelName: str) -> None: ...
-def getLevelName(level: Union[int, str]) -> Any: ...
+def getLevelName(level: int | str) -> Any: ...
 def makeLogRecord(dict: Mapping[str, Any]) -> LogRecord: ...
 @overload
 def basicConfig() -> None: ...
 @overload
 def basicConfig(
     *,
-    filename: Optional[str] = ...,
+    filename: str | None = ...,
     filemode: str = ...,
     format: str = ...,
-    datefmt: Optional[str] = ...,
-    level: Optional[_Level] = ...,
+    datefmt: str | None = ...,
+    level: _Level | None = ...,
     stream: IO[str] = ...,
 ) -> None: ...
 def shutdown(handlerList: Sequence[Any] = ...) -> None: ...  # handlerList is undocumented
@@ -233,14 +229,14 @@ def captureWarnings(capture: bool) -> None: ...
 
 class StreamHandler(Handler):
     stream: IO[str]  # undocumented
-    def __init__(self, stream: Optional[IO[str]] = ...) -> None: ...
+    def __init__(self, stream: IO[str] | None = ...) -> None: ...
 
 class FileHandler(StreamHandler):
     baseFilename: str  # undocumented
     mode: str  # undocumented
-    encoding: Optional[str]  # undocumented
+    encoding: str | None  # undocumented
     delay: bool  # undocumented
-    def __init__(self, filename: StrPath, mode: str = ..., encoding: Optional[str] = ..., delay: bool = ...) -> None: ...
+    def __init__(self, filename: StrPath, mode: str = ..., encoding: str | None = ..., delay: bool = ...) -> None: ...
     def _open(self) -> IO[Any]: ...
 
 class NullHandler(Handler): ...

stdlib/@python2/logging/config.pyi

@@ -1,12 +1,10 @@
 from _typeshed import StrPath
 from threading import Thread
-from typing import IO, Any, Dict, Optional, Union
+from typing import IO, Any, Dict
 
 _Path = StrPath
 
 def dictConfig(config: Dict[str, Any]) -> None: ...
-def fileConfig(
-    fname: Union[str, IO[str]], defaults: Optional[Dict[str, str]] = ..., disable_existing_loggers: bool = ...
-) -> None: ...
+def fileConfig(fname: str | IO[str], defaults: Dict[str, str] | None = ..., disable_existing_loggers: bool = ...) -> None: ...
 def listen(port: int = ...) -> Thread: ...
 def stopListening() -> None: ...

stdlib/@python2/logging/handlers.pyi

@@ -1,7 +1,7 @@
 from _typeshed import StrPath
 from logging import FileHandler, Handler, LogRecord
 from socket import SocketKind, SocketType
-from typing import Any, ClassVar, Dict, List, Optional, Tuple, Union
+from typing import Any, ClassVar, Dict, List, Tuple
 
 DEFAULT_TCP_LOGGING_PORT: int
 DEFAULT_UDP_LOGGING_PORT: int
@@ -13,7 +13,7 @@ SYSLOG_TCP_PORT: int
 class WatchedFileHandler(FileHandler):
     dev: int
     ino: int
-    def __init__(self, filename: StrPath, mode: str = ..., encoding: Optional[str] = ..., delay: bool = ...) -> None: ...
+    def __init__(self, filename: StrPath, mode: str = ..., encoding: str | None = ..., delay: bool = ...) -> None: ...
     def _statstream(self) -> None: ...
 
 class RotatingFileHandler(Handler):
@@ -23,7 +23,7 @@ class RotatingFileHandler(Handler):
         mode: str = ...,
         maxBytes: int = ...,
         backupCount: int = ...,
-        encoding: Optional[str] = ...,
+        encoding: str | None = ...,
         delay: bool = ...,
     ) -> None: ...
     def doRollover(self) -> None: ...
@@ -35,7 +35,7 @@ class TimedRotatingFileHandler(Handler):
         when: str = ...,
         interval: int = ...,
         backupCount: int = ...,
-        encoding: Optional[str] = ...,
+        encoding: str | None = ...,
         delay: bool = ...,
         utc: bool = ...,
     ) -> None: ...
@@ -90,14 +90,12 @@ class SysLogHandler(Handler):
     priority_names: ClassVar[Dict[str, int]]  # undocumented
     facility_names: ClassVar[Dict[str, int]]  # undocumented
     priority_map: ClassVar[Dict[str, str]]  # undocumented
-    def __init__(
-        self, address: Union[Tuple[str, int], str] = ..., facility: int = ..., socktype: Optional[SocketKind] = ...
-    ) -> None: ...
-    def encodePriority(self, facility: Union[int, str], priority: Union[int, str]) -> int: ...
+    def __init__(self, address: Tuple[str, int] | str = ..., facility: int = ..., socktype: SocketKind | None = ...) -> None: ...
+    def encodePriority(self, facility: int | str, priority: int | str) -> int: ...
     def mapPriority(self, levelName: str) -> str: ...
 
 class NTEventLogHandler(Handler):
-    def __init__(self, appname: str, dllname: Optional[str] = ..., logtype: str = ...) -> None: ...
+    def __init__(self, appname: str, dllname: str | None = ..., logtype: str = ...) -> None: ...
     def getEventCategory(self, record: LogRecord) -> int: ...
     # TODO correct return value?
     def getEventType(self, record: LogRecord) -> int: ...
@@ -107,12 +105,12 @@ class SMTPHandler(Handler):
     # TODO `secure` can also be an empty tuple
     def __init__(
         self,
-        mailhost: Union[str, Tuple[str, int]],
+        mailhost: str | Tuple[str, int],
         fromaddr: str,
         toaddrs: List[str],
         subject: str,
-        credentials: Optional[Tuple[str, str]] = ...,
-        secure: Union[Tuple[str], Tuple[str, str], None] = ...,
+        credentials: Tuple[str, str] | None = ...,
+        secure: Tuple[str] | Tuple[str, str] | None = ...,
     ) -> None: ...
     def getSubject(self, record: LogRecord) -> str: ...
 
@@ -122,7 +120,7 @@ class BufferingHandler(Handler):
     def shouldFlush(self, record: LogRecord) -> bool: ...
 
 class MemoryHandler(BufferingHandler):
-    def __init__(self, capacity: int, flushLevel: int = ..., target: Optional[Handler] = ...) -> None: ...
+    def __init__(self, capacity: int, flushLevel: int = ..., target: Handler | None = ...) -> None: ...
     def setTarget(self, target: Handler) -> None: ...
 
 class HTTPHandler(Handler):