Make _MiddlewareFactory compatible with Callable (#2768)

diff --git a/starlette/middleware/__init__.py b/starlette/middleware/__init__.py
index 8e0a54edbdf14563fe79873f1bc9152c3b9202f5..5164e49e044dce0050c4e93667608f37b791b543 100644 (file)
--- a/starlette/middleware/__init__.py
+++ b/starlette/middleware/__init__.py
@@ -14,7 +14,7 @@ P = ParamSpec("P")
 
 
 class _MiddlewareFactory(Protocol[P]):
-    def __call__(self, app: ASGIApp, *args: P.args, **kwargs: P.kwargs) -> ASGIApp: ...  # pragma: no cover
+    def __call__(self, app: ASGIApp, /, *args: P.args, **kwargs: P.kwargs) -> ASGIApp: ...  # pragma: no cover
 
 
 class Middleware:

diff --git a/tests/test_applications.py b/tests/test_applications.py
index 29c011a298c80198b5d86b4fd92dc48e85709386..db2a6050b9f6d2843922a02014875b780c44615a 100644 (file)
--- a/tests/test_applications.py
+++ b/tests/test_applications.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 from contextlib import asynccontextmanager
 from pathlib import Path
-from typing import AsyncGenerator, AsyncIterator, Generator
+from typing import AsyncGenerator, AsyncIterator, Callable, Generator
 
 import anyio.from_thread
 import pytest
@@ -567,9 +567,12 @@ def test_middleware_factory(test_client_factory: TestClientFactory) -> None:
 
         return _app
 
+    def get_middleware_factory() -> Callable[[ASGIApp, str], ASGIApp]:
+        return _middleware_factory
+
     app = Starlette()
     app.add_middleware(_middleware_factory, arg="foo")
-    app.add_middleware(_middleware_factory, arg="bar")
+    app.add_middleware(get_middleware_factory(), "bar")
 
     with test_client_factory(app):
         pass