Big diff: Use new "|" union syntax (#5872)

stdlib/wsgiref/handlers.pyi

@@ -8,7 +8,7 @@ from .util import FileWrapper
 
 _exc_info = Tuple[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]]
 
-def format_date_time(timestamp: Optional[float]) -> str: ...  # undocumented
+def format_date_time(timestamp: float | None) -> str: ...  # undocumented
 def read_environ() -> Dict[str, str]: ...
 
 class BaseHandler:
@@ -19,14 +19,14 @@ class BaseHandler:
 
     origin_server: bool
     http_version: str
-    server_software: Optional[str]
+    server_software: str | None
 
     os_environ: MutableMapping[str, str]
 
-    wsgi_file_wrapper: Optional[Type[FileWrapper]]
+    wsgi_file_wrapper: Type[FileWrapper] | None
     headers_class: Type[Headers]  # undocumented
 
-    traceback_limit: Optional[int]
+    traceback_limit: int | None
     error_status: str
     error_headers: List[Tuple[str, str]]
     error_body: bytes
@@ -37,7 +37,7 @@ class BaseHandler:
     def set_content_length(self) -> None: ...
     def cleanup_headers(self) -> None: ...
     def start_response(
-        self, status: str, headers: List[Tuple[str, str]], exc_info: Optional[_exc_info] = ...
+        self, status: str, headers: List[Tuple[str, str]], exc_info: _exc_info | None = ...
     ) -> Callable[[bytes], None]: ...
     def send_preamble(self) -> None: ...
     def write(self, data: bytes) -> None: ...

stdlib/wsgiref/headers.pyi

@@ -1,24 +1,24 @@
-from typing import List, Optional, Pattern, Tuple, overload
+from typing import List, Pattern, Tuple, overload
 
 _HeaderList = List[Tuple[str, str]]
 
 tspecials: Pattern[str]  # undocumented
 
 class Headers:
-    def __init__(self, headers: Optional[_HeaderList] = ...) -> None: ...
+    def __init__(self, headers: _HeaderList | None = ...) -> None: ...
     def __len__(self) -> int: ...
     def __setitem__(self, name: str, val: str) -> None: ...
     def __delitem__(self, name: str) -> None: ...
-    def __getitem__(self, name: str) -> Optional[str]: ...
+    def __getitem__(self, name: str) -> str | None: ...
     def __contains__(self, name: str) -> bool: ...
     def get_all(self, name: str) -> List[str]: ...
     @overload
     def get(self, name: str, default: str) -> str: ...
     @overload
-    def get(self, name: str, default: Optional[str] = ...) -> Optional[str]: ...
+    def get(self, name: str, default: str | None = ...) -> str | None: ...
     def keys(self) -> List[str]: ...
     def values(self) -> List[str]: ...
     def items(self) -> _HeaderList: ...
     def __bytes__(self) -> bytes: ...
     def setdefault(self, name: str, value: str) -> str: ...
-    def add_header(self, _name: str, _value: Optional[str], **_params: Optional[str]) -> None: ...
+    def add_header(self, _name: str, _value: str | None, **_params: str | None) -> None: ...

stdlib/wsgiref/simple_server.pyi

@@ -1,5 +1,5 @@
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from typing import List, Optional, Type, TypeVar, overload
+from typing import List, Type, TypeVar, overload
 
 from .handlers import SimpleHandler
 from .types import ErrorStream, StartResponse, WSGIApplication, WSGIEnvironment
@@ -13,11 +13,11 @@ class ServerHandler(SimpleHandler):  # undocumented
     def close(self) -> None: ...
 
 class WSGIServer(HTTPServer):
-    application: Optional[WSGIApplication]
+    application: WSGIApplication | None
     base_environ: WSGIEnvironment  # only available after call to setup_environ()
     def setup_environ(self) -> None: ...
-    def get_app(self) -> Optional[WSGIApplication]: ...
-    def set_app(self, application: Optional[WSGIApplication]) -> None: ...
+    def get_app(self) -> WSGIApplication | None: ...
+    def set_app(self, application: WSGIApplication | None) -> None: ...
 
 class WSGIRequestHandler(BaseHTTPRequestHandler):
     server_version: str

stdlib/wsgiref/util.pyi

@@ -1,4 +1,4 @@
-from typing import IO, Any, Callable, Optional
+from typing import IO, Any, Callable
 
 from .types import WSGIEnvironment
 
@@ -14,6 +14,6 @@ class FileWrapper:
 def guess_scheme(environ: WSGIEnvironment) -> str: ...
 def application_uri(environ: WSGIEnvironment) -> str: ...
 def request_uri(environ: WSGIEnvironment, include_query: bool = ...) -> str: ...
-def shift_path_info(environ: WSGIEnvironment) -> Optional[str]: ...
+def shift_path_info(environ: WSGIEnvironment) -> str | None: ...
 def setup_testing_defaults(environ: WSGIEnvironment) -> None: ...
 def is_hop_by_hop(header_name: str) -> bool: ...

stdlib/wsgiref/validate.pyi

@@ -1,5 +1,5 @@
 from _typeshed.wsgi import ErrorStream, InputStream, WSGIApplication
-from typing import Any, Callable, Iterable, Iterator, NoReturn, Optional
+from typing import Any, Callable, Iterable, Iterator, NoReturn
 
 class WSGIWarning(Warning): ...
 
@@ -36,8 +36,8 @@ class IteratorWrapper:
     original_iterator: Iterator[bytes]
     iterator: Iterator[bytes]
     closed: bool
-    check_start_response: Optional[bool]
-    def __init__(self, wsgi_iterator: Iterator[bytes], check_start_response: Optional[bool]) -> None: ...
+    check_start_response: bool | None
+    def __init__(self, wsgi_iterator: Iterator[bytes], check_start_response: bool | None) -> None: ...
     def __iter__(self) -> IteratorWrapper: ...
     def __next__(self) -> bytes: ...
     def close(self) -> None: ...