|
4 | 4 | import sys |
5 | 5 | from collections.abc import AsyncGenerator |
6 | 6 | from collections.abc import Awaitable |
| 7 | +from collections.abc import Callable |
7 | 8 | from collections.abc import Iterator |
8 | 9 | from collections.abc import Mapping |
9 | 10 | from collections.abc import Sequence |
|
14 | 15 | from types import TracebackType |
15 | 16 | from typing import Any |
16 | 17 | from typing import AnyStr |
17 | | -from typing import Callable |
18 | 18 | from typing import Optional |
19 | 19 | from typing import TYPE_CHECKING |
20 | 20 | from typing import Union |
|
84 | 84 | ] |
85 | 85 | AfterServingCallable = Union[Callable[[], None], Callable[[], Awaitable[None]]] |
86 | 86 | AfterWebsocketCallable = Union[ |
87 | | - Callable[[Optional[ResponseTypes]], Optional[ResponseTypes]], |
88 | | - Callable[[Optional[ResponseTypes]], Awaitable[Optional[ResponseTypes]]], |
| 87 | + Callable[[ResponseTypes | None], ResponseTypes | None], |
| 88 | + Callable[[ResponseTypes | None], Awaitable[ResponseTypes | None]], |
89 | 89 | ] |
90 | 90 | BeforeRequestCallable = Union[ |
91 | | - Callable[[], Optional[ResponseReturnValue]], |
92 | | - Callable[[], Awaitable[Optional[ResponseReturnValue]]], |
| 91 | + Callable[[], ResponseReturnValue | None], |
| 92 | + Callable[[], Awaitable[ResponseReturnValue | None]], |
93 | 93 | ] |
94 | 94 | BeforeServingCallable = Union[Callable[[], None], Callable[[], Awaitable[None]]] |
95 | 95 | BeforeWebsocketCallable = Union[ |
96 | | - Callable[[], Optional[ResponseReturnValue]], |
97 | | - Callable[[], Awaitable[Optional[ResponseReturnValue]]], |
| 96 | + Callable[[], ResponseReturnValue | None], |
| 97 | + Callable[[], Awaitable[ResponseReturnValue | None]], |
98 | 98 | ] |
99 | 99 | ErrorHandlerCallable = Union[ |
100 | 100 | Callable[[Any], ResponseReturnValue], |
101 | 101 | Callable[[Any], Awaitable[ResponseReturnValue]], |
102 | 102 | ] |
103 | 103 | ShellContextProcessorCallable = Callable[[], dict[str, Any]] |
104 | 104 | TeardownCallable = Union[ |
105 | | - Callable[[Optional[BaseException]], None], |
106 | | - Callable[[Optional[BaseException]], Awaitable[None]], |
| 105 | + Callable[[BaseException | None], None], |
| 106 | + Callable[[BaseException | None], Awaitable[None]], |
107 | 107 | ] |
108 | 108 | TemplateContextProcessorCallable = Union[ |
109 | 109 | Callable[[], dict[str, Any]], Callable[[], Awaitable[dict[str, Any]]] |
|
112 | 112 | TemplateGlobalCallable = Callable[[Any], Any] |
113 | 113 | TemplateTestCallable = Callable[[Any], bool] |
114 | 114 | URLDefaultCallable = Callable[[str, dict], None] |
115 | | -URLValuePreprocessorCallable = Callable[[Optional[str], Optional[dict]], None] |
| 115 | +URLValuePreprocessorCallable = Callable[[str | None, dict | None], None] |
116 | 116 | WhileServingCallable = Callable[[], AsyncGenerator[None, None]] |
117 | 117 |
|
118 | 118 | RouteCallable = Union[ |
119 | 119 | Callable[..., ResponseReturnValue], |
120 | 120 | Callable[..., Awaitable[ResponseReturnValue]], |
121 | 121 | ] |
122 | 122 | WebsocketCallable = Union[ |
123 | | - Callable[..., Optional[ResponseReturnValue]], |
124 | | - Callable[..., Awaitable[Optional[ResponseReturnValue]]], |
| 123 | + Callable[..., ResponseReturnValue | None], |
| 124 | + Callable[..., Awaitable[ResponseReturnValue | None]], |
125 | 125 | ] |
126 | 126 |
|
127 | 127 |
|
|
0 commit comments