Skip to content

Commit 0e05bbf

Browse files
Merge branch 'main' into fix-pep-646-support
2 parents 755905c + 699b45a commit 0e05bbf

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

Diff for: src/blackd/middlewares.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,27 @@
33
from aiohttp.web_request import Request
44
from aiohttp.web_response import StreamResponse
55

6+
Handler = Callable[[Request], Awaitable[StreamResponse]]
7+
68
if TYPE_CHECKING:
9+
from aiohttp.typedefs import Middleware
10+
711
F = TypeVar("F", bound=Callable[..., Any])
812
middleware: Callable[[F], F]
913
else:
14+
try:
15+
# Available in aiohttp 3.9 and newer
16+
from aiohttp.typedefs import Middleware
17+
except ImportError:
18+
Middleware = Callable[[Request, Handler], Awaitable[StreamResponse]]
19+
1020
try:
1121
from aiohttp.web_middlewares import middleware
1222
except ImportError:
1323
# @middleware is deprecated and its behaviour is the default since aiohttp 4.0
1424
# so if it doesn't exist anymore, define a no-op for forward compatibility.
1525
middleware = lambda x: x # noqa: E731
1626

17-
Handler = Callable[[Request], Awaitable[StreamResponse]]
18-
Middleware = Callable[[Request, Handler], Awaitable[StreamResponse]]
19-
2027

2128
def cors(allow_headers: Iterable[str]) -> Middleware:
2229
@middleware

0 commit comments

Comments
 (0)