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

stubs/requests/requests/adapters.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Container, Mapping, Optional, Text, Tuple, Union
+from typing import Any, Container, Mapping, Text, Tuple
 
 from . import cookies, exceptions, models, structures, utils
 from .packages.urllib3 import exceptions as urllib3_exceptions, poolmanager, response
@@ -32,7 +32,7 @@ RetryError = exceptions.RetryError
 DEFAULT_POOLBLOCK: bool
 DEFAULT_POOLSIZE: int
 DEFAULT_RETRIES: int
-DEFAULT_POOL_TIMEOUT: Optional[float]
+DEFAULT_POOL_TIMEOUT: float | None
 
 class BaseAdapter:
     def __init__(self) -> None: ...
@@ -40,10 +40,10 @@ class BaseAdapter:
         self,
         request: PreparedRequest,
         stream: bool = ...,
-        timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ...,
-        verify: Union[bool, str] = ...,
-        cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ...,
-        proxies: Optional[Mapping[str, str]] = ...,
+        timeout: None | float | Tuple[float, float] | Tuple[float, None] = ...,
+        verify: bool | str = ...,
+        cert: None | bytes | Text | Container[bytes | Text] = ...,
+        proxies: Mapping[str, str] | None = ...,
     ) -> Response: ...
     def close(self) -> None: ...
 
@@ -53,11 +53,7 @@ class HTTPAdapter(BaseAdapter):
     config: Any
     proxy_manager: Any
     def __init__(
-        self,
-        pool_connections: int = ...,
-        pool_maxsize: int = ...,
-        max_retries: Union[Retry, int, None] = ...,
-        pool_block: bool = ...,
+        self, pool_connections: int = ..., pool_maxsize: int = ..., max_retries: Retry | int | None = ..., pool_block: bool = ...
     ) -> None: ...
     poolmanager: Any
     def init_poolmanager(self, connections, maxsize, block=..., **pool_kwargs): ...
@@ -73,8 +69,8 @@ class HTTPAdapter(BaseAdapter):
         self,
         request: PreparedRequest,
         stream: bool = ...,
-        timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = ...,
-        verify: Union[bool, str] = ...,
-        cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ...,
-        proxies: Optional[Mapping[str, str]] = ...,
+        timeout: None | float | Tuple[float, float] | Tuple[float, None] = ...,
+        verify: bool | str = ...,
+        cert: None | bytes | Text | Container[bytes | Text] = ...,
+        proxies: Mapping[str, str] | None = ...,
     ) -> Response: ...

stubs/requests/requests/api.pyi

@@ -1,142 +1,142 @@
-from typing import Any, Optional, Text, Union
+from typing import Any, Text
 
 from .models import Response
 from .sessions import _Data, _Params
 
 def request(
-    method: Union[Text, bytes],
-    url: Union[Text, bytes],
-    params: Optional[_Params] = ...,
-    data: Optional[Any] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    method: Text | bytes,
+    url: Text | bytes,
+    params: _Params | None = ...,
+    data: Any | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
-    json: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
+    json: Any | None = ...,
 ) -> Response: ...
 def get(
-    url: Union[Text, bytes],
-    params: Optional[_Params] = ...,
-    data: Optional[Any] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    url: Text | bytes,
+    params: _Params | None = ...,
+    data: Any | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
-    json: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
+    json: Any | None = ...,
 ) -> Response: ...
 def options(
-    url: Union[Text, bytes],
-    params: Optional[_Params] = ...,
-    data: Optional[Any] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    url: Text | bytes,
+    params: _Params | None = ...,
+    data: Any | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
-    json: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
+    json: Any | None = ...,
 ) -> Response: ...
 def head(
-    url: Union[Text, bytes],
-    params: Optional[_Params] = ...,
-    data: Optional[Any] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    url: Text | bytes,
+    params: _Params | None = ...,
+    data: Any | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
-    json: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
+    json: Any | None = ...,
 ) -> Response: ...
 def post(
-    url: Union[Text, bytes],
+    url: Text | bytes,
     data: _Data = ...,
-    json: Optional[Any] = ...,
-    params: Optional[_Params] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    json: Any | None = ...,
+    params: _Params | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
 ) -> Response: ...
 def put(
-    url: Union[Text, bytes],
+    url: Text | bytes,
     data: _Data = ...,
-    params: Optional[_Params] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    params: _Params | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
-    json: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
+    json: Any | None = ...,
 ) -> Response: ...
 def patch(
-    url: Union[Text, bytes],
+    url: Text | bytes,
     data: _Data = ...,
-    params: Optional[_Params] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    params: _Params | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
-    json: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
+    json: Any | None = ...,
 ) -> Response: ...
 def delete(
-    url: Union[Text, bytes],
-    params: Optional[_Params] = ...,
-    data: Optional[Any] = ...,
-    headers: Optional[Any] = ...,
-    cookies: Optional[Any] = ...,
-    files: Optional[Any] = ...,
-    auth: Optional[Any] = ...,
-    timeout: Optional[Any] = ...,
+    url: Text | bytes,
+    params: _Params | None = ...,
+    data: Any | None = ...,
+    headers: Any | None = ...,
+    cookies: Any | None = ...,
+    files: Any | None = ...,
+    auth: Any | None = ...,
+    timeout: Any | None = ...,
     allow_redirects: bool = ...,
-    proxies: Optional[Any] = ...,
-    hooks: Optional[Any] = ...,
-    stream: Optional[Any] = ...,
-    verify: Optional[Any] = ...,
-    cert: Optional[Any] = ...,
-    json: Optional[Any] = ...,
+    proxies: Any | None = ...,
+    hooks: Any | None = ...,
+    stream: Any | None = ...,
+    verify: Any | None = ...,
+    cert: Any | None = ...,
+    json: Any | None = ...,
 ) -> Response: ...

stubs/requests/requests/auth.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Text, Union
+from typing import Any, Text
 
 from . import cookies, models, utils
 
@@ -9,7 +9,7 @@ to_native_string = utils.to_native_string
 CONTENT_TYPE_FORM_URLENCODED: Any
 CONTENT_TYPE_MULTI_PART: Any
 
-def _basic_auth_str(username: Union[bytes, Text], password: Union[bytes, Text]) -> str: ...
+def _basic_auth_str(username: bytes | Text, password: bytes | Text) -> str: ...
 
 class AuthBase:
     def __call__(self, r: models.PreparedRequest) -> models.PreparedRequest: ...

stubs/requests/requests/models.pyi

@@ -1,6 +1,6 @@
 import datetime
 from json import JSONDecoder
-from typing import Any, Callable, Dict, Iterator, List, Optional, Text, Type, Union
+from typing import Any, Callable, Dict, Iterator, List, Text, Type
 
 from . import auth, cookies, exceptions, hooks, status_codes, structures, utils
 from .cookies import RequestsCookieJar
@@ -67,10 +67,10 @@ class Request(RequestHooksMixin):
     def prepare(self) -> PreparedRequest: ...
 
 class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
-    method: Optional[Union[str, Text]]
-    url: Optional[Union[str, Text]]
+    method: str | Text | None
+    url: str | Text | None
     headers: CaseInsensitiveDict[str]
-    body: Optional[Union[bytes, Text]]
+    body: bytes | Text | None
     hooks: Any
     def __init__(self) -> None: ...
     def prepare(
@@ -88,7 +88,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
 
 class Response:
     __attrs__: Any
-    _content: Optional[bytes]  # undocumented
+    _content: bytes | None  # undocumented
     status_code: int
     headers: CaseInsensitiveDict[str]
     raw: Any
@@ -106,7 +106,7 @@ class Response:
     def __enter__(self) -> Response: ...
     def __exit__(self, *args: Any) -> None: ...
     @property
-    def next(self) -> Optional[PreparedRequest]: ...
+    def next(self) -> PreparedRequest | None: ...
     @property
     def ok(self) -> bool: ...
     @property
@@ -115,9 +115,9 @@ class Response:
     def is_permanent_redirect(self) -> bool: ...
     @property
     def apparent_encoding(self) -> str: ...
-    def iter_content(self, chunk_size: Optional[int] = ..., decode_unicode: bool = ...) -> Iterator[Any]: ...
+    def iter_content(self, chunk_size: int | None = ..., decode_unicode: bool = ...) -> Iterator[Any]: ...
     def iter_lines(
-        self, chunk_size: Optional[int] = ..., decode_unicode: bool = ..., delimiter: Optional[Union[Text, bytes]] = ...
+        self, chunk_size: int | None = ..., decode_unicode: bool = ..., delimiter: Text | bytes | None = ...
     ) -> Iterator[Any]: ...
     @property
     def content(self) -> bytes: ...

stubs/requests/requests/structures.pyi

@@ -1,9 +1,9 @@
-from typing import Any, Dict, Generic, Iterable, Iterator, Mapping, MutableMapping, Optional, Tuple, TypeVar, Union
+from typing import Any, Dict, Generic, Iterable, Iterator, Mapping, MutableMapping, Tuple, TypeVar
 
 _VT = TypeVar("_VT")
 
 class CaseInsensitiveDict(MutableMapping[str, _VT], Generic[_VT]):
-    def __init__(self, data: Optional[Union[Mapping[str, _VT], Iterable[Tuple[str, _VT]]]] = ..., **kwargs: _VT) -> None: ...
+    def __init__(self, data: Mapping[str, _VT] | Iterable[Tuple[str, _VT]] | None = ..., **kwargs: _VT) -> None: ...
     def lower_items(self) -> Iterator[Tuple[str, _VT]]: ...
     def __setitem__(self, key: str, value: _VT) -> None: ...
     def __getitem__(self, key: str) -> _VT: ...
@@ -15,6 +15,6 @@ class CaseInsensitiveDict(MutableMapping[str, _VT], Generic[_VT]):
 class LookupDict(Dict[str, _VT]):
     name: Any
     def __init__(self, name: Any = ...) -> None: ...
-    def __getitem__(self, key: str) -> Optional[_VT]: ...  # type: ignore
+    def __getitem__(self, key: str) -> _VT | None: ...  # type: ignore
     def __getattr__(self, attr: str) -> _VT: ...
     def __setattr__(self, attr: str, value: _VT) -> None: ...

stubs/requests/requests/utils.pyi

@@ -1,4 +1,4 @@
-from typing import Any, AnyStr, Dict, Iterable, Mapping, Optional, Text, Tuple
+from typing import Any, AnyStr, Dict, Iterable, Mapping, Text, Tuple
 
 from . import compat, cookies, exceptions, structures
 
@@ -39,9 +39,9 @@ def dotted_netmask(mask): ...
 def is_ipv4_address(string_ip): ...
 def is_valid_cidr(string_network): ...
 def set_environ(env_name, value): ...
-def should_bypass_proxies(url, no_proxy: Optional[Iterable[AnyStr]]) -> bool: ...
-def get_environ_proxies(url, no_proxy: Optional[Iterable[AnyStr]] = ...) -> Dict[Any, Any]: ...
-def select_proxy(url: Text, proxies: Optional[Mapping[Any, Any]]): ...
+def should_bypass_proxies(url, no_proxy: Iterable[AnyStr] | None) -> bool: ...
+def get_environ_proxies(url, no_proxy: Iterable[AnyStr] | None = ...) -> Dict[Any, Any]: ...
+def select_proxy(url: Text, proxies: Mapping[Any, Any] | None): ...
 def default_user_agent(name=...): ...
 def default_headers(): ...
 def parse_header_links(value): ...