use union types based on pipe operator

Author: EmmanuelNiyonshuti

src/quart/app.py

@@ -21,6 +21,7 @@
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import ParamSpec
 from typing import TypeVar
 from urllib.parse import quote
 
@@ -126,11 +127,6 @@
 from .wrappers import Response
 from .wrappers import Websocket
 
-if sys.version_info >= (3, 10):
-    from typing import ParamSpec
-else:
-    from typing_extensions import ParamSpec
-
 # Python 3.14 deprecated asyncio.iscoroutinefunction, but suggested
 # inspect.iscoroutinefunction does not work correctly in some Python
 # versions before 3.12.

src/quart/asgi.py

@@ -5,7 +5,6 @@
 from functools import partial
 from typing import AnyStr
 from typing import cast
-from typing import Optional
 from typing import TYPE_CHECKING
 from urllib.parse import urlparse
 
@@ -110,7 +109,7 @@ async def handle_request(self, request: Request, send: ASGISendCallable) -> None
             response = await _handle_exception(self.app, error)
 
         if isinstance(response, Response) and response.timeout != Ellipsis:
-            timeout = cast(Optional[float], response.timeout)
+            timeout = cast(float | None, response.timeout)
         else:
             timeout = self.app.config["RESPONSE_TIMEOUT"]
         try:

src/quart/cli.py

@@ -10,11 +10,12 @@
 import re
 import sys
 import traceback
+from collections.abc import Callable
 from importlib import import_module
+from importlib.metadata import entry_points
 from operator import attrgetter
 from types import ModuleType
 from typing import Any
-from typing import Callable
 from typing import TYPE_CHECKING
 
 import click
@@ -488,15 +489,6 @@ def __init__(
     def _load_plugin_commands(self) -> None:
         if self._loaded_plugin_commands:
             return
-
-        if sys.version_info >= (3, 10):
-            from importlib.metadata import entry_points
-        else:
-            # Use a backport on Python < 3.10. We technically have
-            # importlib.metadata on 3.8+, but the API changed in 3.10,
-            # so use the backport for consistency.
-            from importlib_metadata import entry_points
-
         for point in entry_points(group="quart.commands"):
             self.add_command(point.load(), point.name)
 

src/quart/config.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import json
+from collections.abc import Callable
 from typing import Any
-from typing import Callable
 
 from flask.config import Config as FlaskConfig  # noqa: F401
 from flask.config import ConfigAttribute as ConfigAttribute  # noqa: F401

src/quart/ctx.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 import sys
+from collections.abc import Callable
 from contextvars import Token
 from functools import wraps
 from types import TracebackType
 from typing import Any
-from typing import Callable
 from typing import cast
 from typing import TYPE_CHECKING
 

src/quart/formparser.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 from collections.abc import Awaitable
+from collections.abc import Callable
 from typing import Any
-from typing import Callable
 from typing import cast
 from typing import IO
 from typing import NoReturn
-from typing import Optional
 from typing import TYPE_CHECKING
 from urllib.parse import parse_qsl
 
@@ -28,12 +27,12 @@
     from .wrappers.request import Body
 
 StreamFactory = Callable[
-    [Optional[int], Optional[str], Optional[str], Optional[int]],
+    [int | None, str | None, str | None, int | None],
     IO[bytes],
 ]
 
 ParserFunc = Callable[
-    ["FormDataParser", "Body", str, Optional[int], dict[str, str]],
+    ["FormDataParser", "Body", str, int | None, dict[str, str]],
     Awaitable[tuple[MultiDict, MultiDict]],
 ]
 

src/quart/helpers.py

@@ -4,6 +4,7 @@
 import os
 import pkgutil
 import sys
+from collections.abc import Callable
 from collections.abc import Iterable
 from datetime import datetime
 from datetime import timedelta
@@ -13,7 +14,6 @@
 from io import BytesIO
 from pathlib import Path
 from typing import Any
-from typing import Callable
 from typing import cast
 from typing import NoReturn
 from zlib import adler32

src/quart/typing.py

@@ -1,23 +1,18 @@
 from __future__ import annotations
 
 import os
-import sys
 from collections.abc import AsyncGenerator
 from collections.abc import Awaitable
-from collections.abc import Iterator
-from collections.abc import Mapping
-from collections.abc import Sequence
+from collections.abc import Callable
 from contextlib import AbstractAsyncContextManager
 from datetime import datetime
 from datetime import timedelta
 from http.cookiejar import CookieJar
 from types import TracebackType
 from typing import Any
 from typing import AnyStr
-from typing import Callable
-from typing import Optional
+from typing import Protocol
 from typing import TYPE_CHECKING
-from typing import Union
 
 from hypercorn.typing import ASGIReceiveCallable
 from hypercorn.typing import ASGISendCallable
@@ -27,102 +22,97 @@
 
 from .datastructures import FileStorage
 
-if sys.version_info >= (3, 10):
-    from typing import Protocol
-else:
-    from typing_extensions import Protocol
-
 if TYPE_CHECKING:
     from werkzeug.datastructures import Authorization  # noqa: F401
     from werkzeug.datastructures import Headers  # noqa: F401
-    from werkzeug.wrappers import Response as WerkzeugResponse
 
     from .app import Quart
     from .sessions import SessionMixin
     from .wrappers.response import Response  # noqa: F401
 
-FilePath = Union[bytes, str, os.PathLike]
+FilePath = bytes | str | os.PathLike
 
 # The possible types that are directly convertible or are a Response object.
-ResponseValue = Union[
-    "Response",
-    "WerkzeugResponse",
-    bytes,
-    str,
-    Mapping[str, Any],  # any jsonify-able dict
-    list[Any],  # any jsonify-able list
-    Iterator[bytes],
-    Iterator[str],
-]
+ResponseValue = (
+    "Response"
+    " | WerkzeugResponse"
+    " | bytes"
+    " | str"
+    " | Mapping[str, Any]"  # any jsonify-able dict
+    " | list[Any]"  # any jsonify-able list
+    " | Iterator[bytes]"
+    " | Iterator[str]"
+)
 StatusCode = int
 
 # the possible types for an individual HTTP header
 HeaderName = str
-HeaderValue = Union[str, list[str], tuple[str, ...]]
+HeaderValue = str | list[str] | tuple[str, ...]
 
 # the possible types for HTTP headers
-HeadersValue = Union[
-    "Headers",
-    Mapping[HeaderName, HeaderValue],
-    Sequence[tuple[HeaderName, HeaderValue]],
-]
+HeadersValue = (
+    "Headers"
+    " | Mapping[HeaderName, HeaderValue]"
+    " | Sequence[tuple[HeaderName, HeaderValue]]"
+)
 
 # The possible types returned by a route function.
-ResponseReturnValue = Union[
-    ResponseValue,
-    tuple[ResponseValue, HeadersValue],
-    tuple[ResponseValue, StatusCode],
-    tuple[ResponseValue, StatusCode, HeadersValue],
-]
-
-ResponseTypes = Union["Response", "WerkzeugResponse"]
-
-AppOrBlueprintKey = Optional[str]  # The App key is None, whereas blueprints are named
-AfterRequestCallable = Union[
-    Callable[[ResponseTypes], ResponseTypes],
-    Callable[[ResponseTypes], Awaitable[ResponseTypes]],
-]
-AfterServingCallable = Union[Callable[[], None], Callable[[], Awaitable[None]]]
-AfterWebsocketCallable = Union[
-    Callable[[Optional[ResponseTypes]], Optional[ResponseTypes]],
-    Callable[[Optional[ResponseTypes]], Awaitable[Optional[ResponseTypes]]],
-]
-BeforeRequestCallable = Union[
-    Callable[[], Optional[ResponseReturnValue]],
-    Callable[[], Awaitable[Optional[ResponseReturnValue]]],
-]
-BeforeServingCallable = Union[Callable[[], None], Callable[[], Awaitable[None]]]
-BeforeWebsocketCallable = Union[
-    Callable[[], Optional[ResponseReturnValue]],
-    Callable[[], Awaitable[Optional[ResponseReturnValue]]],
-]
-ErrorHandlerCallable = Union[
-    Callable[[Any], ResponseReturnValue],
-    Callable[[Any], Awaitable[ResponseReturnValue]],
-]
+ResponseReturnValue = (
+    "ResponseValue"
+    " | tuple[ResponseValue, HeadersValue]"
+    " | tuple[ResponseValue, StatusCode]"
+    " | tuple[ResponseValue, StatusCode, HeadersValue]"
+)
+
+ResponseTypes = "Response | WerkzeugResponse"
+
+AppOrBlueprintKey = str | None  # The App key is None, whereas blueprints are named
+AfterRequestCallable = (
+    "Callable[[ResponseTypes], ResponseTypes]"
+    " | Callable[[ResponseTypes], Awaitable[ResponseTypes]]"
+)
+AfterServingCallable = Callable[[], None] | Callable[[], Awaitable[None]]
+AfterWebsocketCallable = (
+    "Callable[[ResponseTypes | None], ResponseTypes | None]"
+    " | Callable[[ResponseTypes | None], Awaitable[ResponseTypes | None]]"
+)
+
+BeforeRequestCallable = (
+    "Callable[[], ResponseReturnValue | None]"
+    " | Callable[[], Awaitable[ResponseReturnValue | None]]"
+)
+
+BeforeServingCallable = Callable[[], None] | Callable[[], Awaitable[None]]
+BeforeWebsocketCallable = (
+    "Callable[[], ResponseReturnValue | None]"
+    " | Callable[[], Awaitable[ResponseReturnValue | None]]"
+)
+ErrorHandlerCallable = (
+    "Callable[[Any], ResponseReturnValue]"
+    " | Callable[[Any], Awaitable[ResponseReturnValue]]"
+)
 ShellContextProcessorCallable = Callable[[], dict[str, Any]]
-TeardownCallable = Union[
-    Callable[[Optional[BaseException]], None],
-    Callable[[Optional[BaseException]], Awaitable[None]],
-]
-TemplateContextProcessorCallable = Union[
-    Callable[[], dict[str, Any]], Callable[[], Awaitable[dict[str, Any]]]
-]
+TeardownCallable = (
+    "Callable[[BaseException | None], None]"
+    " | Callable[[BaseException | None], Awaitable[None]]"
+)
+TemplateContextProcessorCallable = (
+    Callable[[], dict[str, Any]] | Callable[[], Awaitable[dict[str, Any]]]
+)
 TemplateFilterCallable = Callable[[Any], Any]
 TemplateGlobalCallable = Callable[[Any], Any]
 TemplateTestCallable = Callable[[Any], bool]
 URLDefaultCallable = Callable[[str, dict], None]
-URLValuePreprocessorCallable = Callable[[Optional[str], Optional[dict]], None]
+URLValuePreprocessorCallable = Callable[[str | None, dict | None], None]
 WhileServingCallable = Callable[[], AsyncGenerator[None, None]]
 
-RouteCallable = Union[
-    Callable[..., ResponseReturnValue],
-    Callable[..., Awaitable[ResponseReturnValue]],
-]
-WebsocketCallable = Union[
-    Callable[..., Optional[ResponseReturnValue]],
-    Callable[..., Awaitable[Optional[ResponseReturnValue]]],
-]
+RouteCallable = (
+    "Callable[..., ResponseReturnValue] | Callable[..., Awaitable[ResponseReturnValue]]"
+)
+WebsocketCallable = (
+    "Callable[..., ResponseReturnValue | None]"
+    " | Callable[..., Awaitable[ResponseReturnValue | None]]"
+)
 
 
 class ASGIHTTPProtocol(Protocol):

src/quart/views.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from collections.abc import Collection
 from typing import Any
-from typing import Callable
 from typing import ClassVar
 
 from .globals import current_app

src/quart/wrappers/request.py

@@ -2,9 +2,9 @@
 
 import asyncio
 from collections.abc import Awaitable
+from collections.abc import Callable
 from collections.abc import Generator
 from typing import Any
-from typing import Callable
 from typing import Literal
 from typing import NoReturn
 from typing import overload