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

stdlib/http/cookiejar.pyi

@@ -1,7 +1,7 @@
 import sys
 from _typeshed import StrPath
 from http.client import HTTPResponse
-from typing import ClassVar, Dict, Iterable, Iterator, Optional, Pattern, Sequence, Tuple, TypeVar, Union, overload
+from typing import ClassVar, Dict, Iterable, Iterator, Pattern, Sequence, Tuple, TypeVar, overload
 from urllib.request import Request
 
 _T = TypeVar("_T")
@@ -15,14 +15,14 @@ class CookieJar(Iterable[Cookie]):
     domain_re: ClassVar[Pattern[str]] = ...  # undocumented
     dots_re: ClassVar[Pattern[str]] = ...  # undocumented
     magic_re: ClassVar[Pattern[str]] = ...  # undocumented
-    def __init__(self, policy: Optional[CookiePolicy] = ...) -> None: ...
+    def __init__(self, policy: CookiePolicy | None = ...) -> None: ...
     def add_cookie_header(self, request: Request) -> None: ...
     def extract_cookies(self, response: HTTPResponse, request: Request) -> None: ...
     def set_policy(self, policy: CookiePolicy) -> None: ...
     def make_cookies(self, response: HTTPResponse, request: Request) -> Sequence[Cookie]: ...
     def set_cookie(self, cookie: Cookie) -> None: ...
     def set_cookie_if_ok(self, cookie: Cookie, request: Request) -> None: ...
-    def clear(self, domain: Optional[str] = ..., path: Optional[str] = ..., name: Optional[str] = ...) -> None: ...
+    def clear(self, domain: str | None = ..., path: str | None = ..., name: str | None = ...) -> None: ...
     def clear_session_cookies(self) -> None: ...
     def clear_expired_cookies(self) -> None: ...  # undocumented
     def __iter__(self) -> Iterator[Cookie]: ...
@@ -34,16 +34,12 @@ class FileCookieJar(CookieJar):
     filename: str
     delayload: bool
     if sys.version_info >= (3, 8):
-        def __init__(
-            self, filename: Optional[StrPath] = ..., delayload: bool = ..., policy: Optional[CookiePolicy] = ...
-        ) -> None: ...
+        def __init__(self, filename: StrPath | None = ..., delayload: bool = ..., policy: CookiePolicy | None = ...) -> None: ...
     else:
-        def __init__(
-            self, filename: Optional[str] = ..., delayload: bool = ..., policy: Optional[CookiePolicy] = ...
-        ) -> None: ...
-    def save(self, filename: Optional[str] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ...
-    def load(self, filename: Optional[str] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ...
-    def revert(self, filename: Optional[str] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ...
+        def __init__(self, filename: str | None = ..., delayload: bool = ..., policy: CookiePolicy | None = ...) -> None: ...
+    def save(self, filename: str | None = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ...
+    def load(self, filename: str | None = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ...
+    def revert(self, filename: str | None = ..., ignore_discard: bool = ..., ignore_expires: bool = ...) -> None: ...
 
 class MozillaCookieJar(FileCookieJar):
     header: ClassVar[str] = ...  # undocumented
@@ -76,11 +72,11 @@ class DefaultCookiePolicy(CookiePolicy):
     if sys.version_info >= (3, 8):
         def __init__(
             self,
-            blocked_domains: Optional[Sequence[str]] = ...,
-            allowed_domains: Optional[Sequence[str]] = ...,
+            blocked_domains: Sequence[str] | None = ...,
+            allowed_domains: Sequence[str] | None = ...,
             netscape: bool = ...,
             rfc2965: bool = ...,
-            rfc2109_as_netscape: Optional[bool] = ...,
+            rfc2109_as_netscape: bool | None = ...,
             hide_cookie2: bool = ...,
             strict_domain: bool = ...,
             strict_rfc2965_unverifiable: bool = ...,
@@ -93,11 +89,11 @@ class DefaultCookiePolicy(CookiePolicy):
     else:
         def __init__(
             self,
-            blocked_domains: Optional[Sequence[str]] = ...,
-            allowed_domains: Optional[Sequence[str]] = ...,
+            blocked_domains: Sequence[str] | None = ...,
+            allowed_domains: Sequence[str] | None = ...,
             netscape: bool = ...,
             rfc2965: bool = ...,
-            rfc2109_as_netscape: Optional[bool] = ...,
+            rfc2109_as_netscape: bool | None = ...,
             hide_cookie2: bool = ...,
             strict_domain: bool = ...,
             strict_rfc2965_unverifiable: bool = ...,
@@ -109,8 +105,8 @@ class DefaultCookiePolicy(CookiePolicy):
     def blocked_domains(self) -> Tuple[str, ...]: ...
     def set_blocked_domains(self, blocked_domains: Sequence[str]) -> None: ...
     def is_blocked(self, domain: str) -> bool: ...
-    def allowed_domains(self) -> Optional[Tuple[str, ...]]: ...
-    def set_allowed_domains(self, allowed_domains: Optional[Sequence[str]]) -> None: ...
+    def allowed_domains(self) -> Tuple[str, ...] | None: ...
+    def set_allowed_domains(self, allowed_domains: Sequence[str] | None) -> None: ...
     def is_not_allowed(self, domain: str) -> bool: ...
     def set_ok_version(self, cookie: Cookie, request: Request) -> bool: ...  # undocumented
     def set_ok_verifiability(self, cookie: Cookie, request: Request) -> bool: ...  # undocumented
@@ -126,17 +122,17 @@ class DefaultCookiePolicy(CookiePolicy):
     def return_ok_domain(self, cookie: Cookie, request: Request) -> bool: ...  # undocumented
 
 class Cookie:
-    version: Optional[int]
+    version: int | None
     name: str
-    value: Optional[str]
-    port: Optional[str]
+    value: str | None
+    port: str | None
     path: str
     path_specified: bool
     secure: bool
-    expires: Optional[int]
+    expires: int | None
     discard: bool
-    comment: Optional[str]
-    comment_url: Optional[str]
+    comment: str | None
+    comment_url: str | None
     rfc2109: bool
     port_specified: bool
     domain: str  # undocumented
@@ -144,10 +140,10 @@ class Cookie:
     domain_initial_dot: bool
     def __init__(
         self,
-        version: Optional[int],
+        version: int | None,
         name: str,
-        value: Optional[str],  # undocumented
-        port: Optional[str],
+        value: str | None,  # undocumented
+        port: str | None,
         port_specified: bool,
         domain: str,
         domain_specified: bool,
@@ -155,17 +151,17 @@ class Cookie:
         path: str,
         path_specified: bool,
         secure: bool,
-        expires: Optional[int],
+        expires: int | None,
         discard: bool,
-        comment: Optional[str],
-        comment_url: Optional[str],
+        comment: str | None,
+        comment_url: str | None,
         rest: Dict[str, str],
         rfc2109: bool = ...,
     ) -> None: ...
     def has_nonstandard_attr(self, name: str) -> bool: ...
     @overload
-    def get_nonstandard_attr(self, name: str) -> Optional[str]: ...
+    def get_nonstandard_attr(self, name: str) -> str | None: ...
     @overload
-    def get_nonstandard_attr(self, name: str, default: _T) -> Union[str, _T]: ...
+    def get_nonstandard_attr(self, name: str, default: _T) -> str | _T: ...
     def set_nonstandard_attr(self, name: str, value: str) -> None: ...
-    def is_expired(self, now: Optional[int] = ...) -> bool: ...
+    def is_expired(self, now: int | None = ...) -> bool: ...