basedpyright 1.28.3 → 1.28.4

package/dist/typeshed-fallback/stubs/WebOb/webob/byterange.pyi

@@ -2,6 +2,8 @@ from collections.abc import Iterator
 from typing import overload
 from typing_extensions import Self
 
+__all__ = ["Range", "ContentRange"]
+
 class Range:
     start: int | None
     end: int | None

package/dist/typeshed-fallback/stubs/WebOb/webob/cachecontrol.pyi

@@ -1,96 +1,96 @@
-from collections.abc import Callable, MutableMapping
-from typing import Any, Generic, Literal, TypeVar, overload
-from typing_extensions import Self, TypeAlias
-
-from webob.request import Request
-from webob.response import Response
+from _typeshed import SupportsItems
+from collections.abc import Callable
+from typing import Any, Generic, Literal, overload
+from typing_extensions import Self, TypeVar
 
 _T = TypeVar("_T")
-_KT = TypeVar("_KT")
-_VT = TypeVar("_VT")
-_NoneLiteral = TypeVar("_NoneLiteral")
-_Type: TypeAlias = type
+_DefaultT = TypeVar("_DefaultT", default=None)
+_NoneLiteral = TypeVar("_NoneLiteral", default=None)
+_ScopeT = TypeVar("_ScopeT", Literal["request"], Literal["response"], None, default=None)
+_ScopeT2 = TypeVar("_ScopeT2", Literal["request"], Literal["response"], None)
 
-class UpdateDict(dict[_KT, _VT]):
+class UpdateDict(dict[str, Any]):
     updated: Callable[..., Any] | None
     updated_args: tuple[Any, ...] | None
 
-class exists_property:
-    prop: str
-    type: str | None
-    def __init__(self, prop: str, type: str | None = None) -> None: ...
+class exists_property(Generic[_ScopeT]):
+    def __init__(self, prop: str, type: _ScopeT = ...) -> None: ...
     @overload
-    def __get__(self, obj: None, type: _Type | None = None) -> Self: ...
+    def __get__(self, obj: None, type: type[CacheControl[Any]] | None = None) -> Self: ...
     @overload
-    def __get__(self, obj: Any, type: _Type | None = None) -> bool: ...
-    def __set__(self, obj: Any, value: bool | None) -> None: ...
-    def __delete__(self, obj: Any) -> None: ...
-
-class value_property(Generic[_T, _NoneLiteral]):
-    prop: str
-    default: _T | None
-    none: _NoneLiteral
-    type: str | None
+    def __get__(self: exists_property[None], obj: CacheControl[Any], type: type[CacheControl[Any]] | None = None) -> bool: ...
     @overload
-    def __init__(self, prop: str, default: None = None, none: None = None, type: str | None = None) -> None: ...
+    def __get__(self, obj: CacheControl[_ScopeT], type: type[CacheControl[Any]] | None = None) -> bool: ...
     @overload
-    def __init__(self, prop: str, default: _T, none: _NoneLiteral, type: str | None = None) -> None: ...
+    def __set__(self: exists_property[None], obj: CacheControl[Any], value: bool | None) -> None: ...
     @overload
-    def __get__(self, obj: None, type: _Type | None = None) -> Self: ...
+    def __set__(self, obj: CacheControl[_ScopeT], value: bool | None) -> None: ...
     @overload
-    def __get__(self, obj: Any, type: _Type | None = None) -> _T | _NoneLiteral | None: ...
-    def __set__(self, obj: Any, value: _T | Literal[True] | None) -> None: ...
-    def __delete__(self, obj: Any) -> None: ...
-
-class _IntValueProperty(value_property[int, _NoneLiteral]):
-    def __set__(self, obj: Any, value: int | None) -> None: ...
+    def __delete__(self, obj: CacheControl[Any]) -> None: ...
+    @overload
+    def __delete__(self, obj: CacheControl[_ScopeT]) -> None: ...
 
-class _BaseCacheControl:
-    update_dict = UpdateDict
-    properties: MutableMapping[str, Any]
-    type: Literal["request", "response"] | None
-    @classmethod
+class value_property(Generic[_T, _DefaultT, _NoneLiteral, _ScopeT]):
+    def __init__(self, prop: str, default: _DefaultT = ..., none: _NoneLiteral = ..., type: _ScopeT = ...) -> None: ...
     @overload
-    def parse(cls, header: str, updates_to: None = None, type: None = None) -> _AnyCacheControl: ...
-    @classmethod
+    def __get__(self, obj: None, type: type[CacheControl[Any]] | None = None) -> Self: ...
     @overload
-    def parse(cls, header: str, updates_to: Request, type: Literal["request"]) -> _RequestCacheControl: ...
-    @classmethod
+    def __get__(
+        self: value_property[_T, _DefaultT, _NoneLiteral, None],
+        obj: CacheControl[Any] | None,
+        type: type[CacheControl[Any]] | None = None,
+    ) -> _T | _DefaultT | _NoneLiteral: ...
     @overload
-    def parse(cls, header: str, updates_to: Response, type: Literal["response"]) -> _ResponseCacheControl: ...
-
-    no_cache: value_property[str, Literal["*"]]
-    no_store: exists_property
-    no_transform: exists_property
-    max_age: _IntValueProperty[Literal[-1]]
-    def copy(self) -> Self: ...
-
-class _RequestCacheControl(_BaseCacheControl):
-    type: Literal["request"]
-    max_stale: _IntValueProperty[Literal["*"]]
-    min_fresh: _IntValueProperty[None]
-    only_if_cached: exists_property
-
-class _ResponseCacheControl(_BaseCacheControl):
-    type: Literal["response"]
-    public: exists_property
-    private: value_property[str, Literal["*"]]
-    must_revalidate: exists_property
-    proxy_revalidate: exists_property
-    s_maxage: _IntValueProperty[None]
-    s_max_age: _IntValueProperty[None]
-    stale_while_revalidate: _IntValueProperty[None]
-    stale_if_error: _IntValueProperty[None]
-
-class _AnyCacheControl(_RequestCacheControl, _ResponseCacheControl):
-    type: None  # type: ignore[assignment]
+    def __get__(
+        self, obj: CacheControl[_ScopeT] | None, type: type[CacheControl[Any]] | None = None
+    ) -> _T | _DefaultT | _NoneLiteral: ...
+    @overload
+    def __set__(
+        self: value_property[_T, _DefaultT, _NoneLiteral, None],
+        obj: CacheControl[Any],
+        value: _T | _DefaultT | Literal[True] | None,
+    ) -> None: ...
+    @overload
+    def __set__(self, obj: CacheControl[_ScopeT], value: _T | _DefaultT | Literal[True] | None) -> None: ...
+    @overload
+    def __delete__(self, obj: CacheControl[Any]) -> None: ...
+    @overload
+    def __delete__(self, obj: CacheControl[_ScopeT]) -> None: ...
 
-class CacheControl(_AnyCacheControl):
+class CacheControl(Generic[_ScopeT]):
+    header_value: str
+    update_dict: type[UpdateDict]
+    properties: dict[str, Any]
+    type: _ScopeT
+    def __init__(self, properties: dict[str, Any], type: _ScopeT) -> None: ...
     @overload
-    def __init__(self: _AnyCacheControl, properties: MutableMapping[str, Any], type: None) -> None: ...
+    @classmethod
+    def parse(
+        cls, header: str, updates_to: Callable[[dict[str, Any]], Any] | None = None, type: None = None
+    ) -> CacheControl[None]: ...
     @overload
-    def __init__(self: _RequestCacheControl, properties: MutableMapping[str, Any], type: Literal["request"]) -> None: ...
+    @classmethod
+    def parse(cls, header: str, updates_to: Callable[[dict[str, Any]], Any] | None, type: _ScopeT2) -> CacheControl[_ScopeT2]: ...
     @overload
-    def __init__(self: _ResponseCacheControl, properties: MutableMapping[str, Any], type: Literal["response"]) -> None: ...
+    @classmethod
+    def parse(
+        cls, header: str, updates_to: Callable[[dict[str, Any]], Any] | None = None, *, type: _ScopeT2
+    ) -> CacheControl[_ScopeT2]: ...
+    max_stale: value_property[int, None, Literal["*"], Literal["request"]]
+    min_fresh: value_property[int, None, None, Literal["request"]]
+    only_if_cached: exists_property[Literal["request"]]
+    public: exists_property[Literal["response"]]
+    private: value_property[str, None, Literal["*"], Literal["response"]]
+    no_cache: value_property[str, None, Literal["*"], None]
+    no_store: exists_property[None]
+    no_transform: exists_property[None]
+    must_revalidate: exists_property[Literal["response"]]
+    proxy_revalidate: exists_property[Literal["response"]]
+    max_age: value_property[int, None, Literal[-1], None]
+    s_maxage: value_property[int, None, None, Literal["response"]]
+    s_max_age = s_maxage
+    stale_while_revalidate: value_property[int, None, None, Literal["response"]]
+    stale_if_error: value_property[int, None, None, Literal["response"]]
+    def copy(self) -> Self: ...
 
-def serialize_cache_control(properties: MutableMapping[str, Any] | _BaseCacheControl) -> str: ...
+def serialize_cache_control(properties: SupportsItems[str, Any] | CacheControl[Any]) -> str: ...

package/dist/typeshed-fallback/stubs/WebOb/webob/client.pyi

@@ -3,6 +3,8 @@ from collections.abc import Iterable
 from http.client import HTTPConnection, HTTPMessage, HTTPSConnection
 from typing import ClassVar
 
+__all__ = ["send_request_app", "SendRequest"]
+
 class SendRequest:
     def __init__(self, HTTPConnection: type[HTTPConnection] = ..., HTTPSConnection: type[HTTPSConnection] = ...) -> None: ...
     def __call__(self, environ: WSGIEnvironment, start_response: StartResponse) -> Iterable[bytes]: ...

package/dist/typeshed-fallback/stubs/WebOb/webob/compat.pyi

@@ -0,0 +1,24 @@
+import sys
+from html import escape as escape
+from io import FileIO, TextIOWrapper
+from queue import Empty as Empty, Queue as Queue
+from typing import IO
+
+if sys.version_info >= (3, 13):
+    # NOTE: These are the only attributes we realistically care about
+    class cgi_FieldStorage:
+        filename: str
+        file: IO[bytes]
+        def make_file(self) -> TextIOWrapper | FileIO: ...
+
+    def parse_header(line: str) -> tuple[str, dict[str, str]]: ...
+
+else:
+    from cgi import FieldStorage as _cgi_FieldStorage, parse_header as parse_header
+
+    class cgi_FieldStorage(_cgi_FieldStorage):
+        # NOTE: The only kinds of objects of this type the user is exposed to
+        #       will contain a file with a filename. We're technically lying
+        #       if people create their own instances, but that shouldn't happen
+        filename: str
+        file: IO[bytes]

package/dist/typeshed-fallback/stubs/WebOb/webob/cookies.pyi

@@ -1,15 +1,25 @@
 from _typeshed import sentinel
 from _typeshed.wsgi import WSGIEnvironment
-from collections.abc import Callable, Collection, ItemsView, Iterator, KeysView, MutableMapping, ValuesView
+from collections.abc import Collection, ItemsView, Iterator, KeysView, MutableMapping, ValuesView
 from datetime import date, datetime, timedelta
-from hashlib import _Hash
+from time import _TimeTuple, struct_time
 from typing import Any, Literal, Protocol, TypeVar, overload
 from typing_extensions import TypeAlias
 
-from webob.descriptors import _AsymmetricProperty
-from webob.request import Request
+from webob._types import AsymmetricProperty
+from webob.request import BaseRequest
 from webob.response import Response
 
+__all__ = [
+    "Cookie",
+    "CookieProfile",
+    "SignedCookieProfile",
+    "SignedSerializer",
+    "JSONSerializer",
+    "Base64Serializer",
+    "make_cookie",
+]
+
 _T = TypeVar("_T")
 # we accept both the official spelling and the one used in the WebOb docs
 # the implementation compares after lower() so technically there are more
@@ -27,7 +37,7 @@ class RequestCookies(MutableMapping[str, str]):
     @overload
     def get(self, name: str, default: None = None) -> str | None: ...
     @overload
-    def get(self, name: str, default: str | _T) -> str | _T: ...
+    def get(self, name: str, default: _T) -> str | _T: ...
     def __delitem__(self, name: str) -> None: ...
     def keys(self) -> KeysView[str]: ...
     def values(self) -> ValuesView[str]: ...
@@ -37,11 +47,11 @@ class RequestCookies(MutableMapping[str, str]):
     def __len__(self) -> int: ...
     def clear(self) -> None: ...
 
-class Cookie(dict[str, Morsel]):
+class Cookie(dict[bytes, Morsel]):
     def __init__(self, input: str | None = None) -> None: ...
     def load(self, data: str) -> None: ...
-    def add(self, key: str | bytes, val: str | bytes) -> Morsel: ...
-    def __setitem__(self, key: str | bytes, val: str | bytes) -> Morsel: ...  # type: ignore[override]
+    def add(self, key: str | bytes, val: str | bytes) -> Morsel | dict[bytes, bytes]: ...
+    def __setitem__(self, key: str | bytes, val: str | bytes) -> Morsel | dict[bytes, bytes]: ...  # type: ignore[override]
     def serialize(self, full: bool = True) -> str: ...
     def values(self) -> list[Morsel]: ...  # type: ignore[override]
     def __str__(self, full: bool = True) -> str: ...
@@ -62,17 +72,12 @@ class Morsel(dict[bytes, bytes | bool | None]):
     def comment(self) -> bytes | None: ...
     @comment.setter
     def comment(self, v: bytes | None) -> None: ...
-    expires: _AsymmetricProperty[bytes | None, datetime | date | timedelta | int | str | bytes | None]
-    max_age: _AsymmetricProperty[bytes | None, timedelta | int | str | bytes]
-    @property
-    def httponly(self) -> bool | None: ...
-    @httponly.setter
-    def httponly(self, v: bool) -> None: ...
-    @property
-    def secure(self) -> bool | None: ...
-    @secure.setter
-    def secure(self, v: bool) -> None: ...
-    samesite: _AsymmetricProperty[bytes | None, _SameSitePolicy | None]
+    expires: AsymmetricProperty[bytes | None, datetime | date | timedelta | _TimeTuple | struct_time | int | str | bytes | None]
+    max_age: AsymmetricProperty[bytes | None, timedelta | int | str | bytes | None]
+    httponly: AsymmetricProperty[bool, bool | None]
+    secure: AsymmetricProperty[bool, bool | None]
+    samesite: AsymmetricProperty[bytes, _SameSitePolicy | bytes]
+    def __setitem__(self, k: str | bytes, v: bytes | bool | None) -> None: ...
     def serialize(self, full: bool = True) -> str: ...
     def __str__(self, full: bool = True) -> str: ...
 
@@ -82,8 +87,8 @@ def make_cookie(
     max_age: int | timedelta | None = None,
     path: str = "/",
     domain: str | None = None,
-    secure: bool = False,
-    httponly: bool = False,
+    secure: bool | None = False,
+    httponly: bool | None = False,
     comment: str | None = None,
     samesite: _SameSitePolicy | None = None,
 ) -> str: ...
@@ -99,14 +104,15 @@ class Base64Serializer:
     def loads(self, bstruct: bytes) -> Any: ...
 
 class SignedSerializer:
-    salt: str
-    secret: str
+    salt: str | bytes
+    secret: str | bytes
     hashalg: str
     salted_secret: bytes
-    digestmod: Callable[[bytes], _Hash]
     digest_size: int
     serializer: _Serializer
-    def __init__(self, secret: str, salt: str, hashalg: str = "sha512", serializer: _Serializer | None = None) -> None: ...
+    def __init__(
+        self, secret: str | bytes, salt: str | bytes, hashalg: str = "sha512", serializer: _Serializer | None = None
+    ) -> None: ...
     def dumps(self, appstruct: Any) -> bytes: ...
     def loads(self, bstruct: bytes) -> Any: ...
 
@@ -119,7 +125,7 @@ class CookieProfile:
     path: str
     domains: Collection[str] | None
     serializer: _Serializer
-    request: Request | None
+    request: BaseRequest | None
     def __init__(
         self,
         cookie_name: str,
@@ -133,8 +139,8 @@ class CookieProfile:
         domains: Collection[str] | None = None,
         serializer: _Serializer | None = None,
     ) -> None: ...
-    def __call__(self, request: Request) -> CookieProfile: ...
-    def bind(self, request: Request) -> CookieProfile: ...
+    def __call__(self, request: BaseRequest) -> CookieProfile: ...
+    def bind(self, request: BaseRequest) -> CookieProfile: ...
     def get_value(self) -> Any | None: ...
     def set_cookies(
         self,
@@ -159,10 +165,9 @@ class CookieProfile:
     ) -> list[tuple[str, str]]: ...
 
 class SignedCookieProfile(CookieProfile):
-    secret: str
-    salt: str
+    secret: str | bytes
+    salt: str | bytes
     hashalg: str
-    serializer: SignedSerializer
     original_serializer: _Serializer
     def __init__(
         self,
@@ -171,12 +176,12 @@ class SignedCookieProfile(CookieProfile):
         cookie_name: str,
         secure: bool = False,
         max_age: int | timedelta | None = None,
-        httponly: bool = False,
+        httponly: bool | None = False,
         samesite: _SameSitePolicy | None = None,
         path: str = "/",
         domains: Collection[str] | None = None,
         hashalg: str = "sha512",
         serializer: _Serializer | None = None,
     ) -> None: ...
-    def __call__(self, request: Request) -> SignedCookieProfile: ...
-    def bind(self, request: Request) -> SignedCookieProfile: ...
+    def __call__(self, request: BaseRequest) -> SignedCookieProfile: ...
+    def bind(self, request: BaseRequest) -> SignedCookieProfile: ...

package/dist/typeshed-fallback/stubs/WebOb/webob/datetime_utils.pyi

@@ -1,6 +1,22 @@
 from datetime import date, datetime, timedelta, tzinfo
 from time import _TimeTuple, struct_time
 
+__all__ = [
+    "UTC",
+    "timedelta_to_seconds",
+    "year",
+    "month",
+    "week",
+    "day",
+    "hour",
+    "minute",
+    "second",
+    "parse_date",
+    "serialize_date",
+    "parse_date_delta",
+    "serialize_date_delta",
+]
+
 class _UTC(tzinfo):
     def dst(self, dt: datetime | None) -> timedelta: ...
     def utcoffset(self, dt: datetime | None) -> timedelta: ...

package/dist/typeshed-fallback/stubs/WebOb/webob/dec.pyi

@@ -1,42 +1,42 @@
 from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment
 from collections.abc import Callable, Iterable, Mapping
-from typing import Any, Generic, TypeVar, overload
-from typing_extensions import Concatenate, Never, ParamSpec, Self, TypeAlias
+from typing import Any, Generic, overload
+from typing_extensions import Concatenate, Never, ParamSpec, Self, TypeAlias, TypeVar
 
-from webob.request import Request
+from webob.request import BaseRequest, Request
 from webob.response import Response
 
+__all__ = ["wsgify"]
+
 _AnyResponse: TypeAlias = Response | WSGIApplication | str | None
 _S = TypeVar("_S")
 _AppT = TypeVar("_AppT", bound=WSGIApplication)
 _AppT_contra = TypeVar("_AppT_contra", bound=WSGIApplication, contravariant=True)
-_RequestT = TypeVar("_RequestT", bound=Request)
-_RequestT_contra = TypeVar("_RequestT_contra", bound=Request, contravariant=True)
+_RequestT = TypeVar("_RequestT", bound=BaseRequest)
+_RequestT_contra = TypeVar("_RequestT_contra", bound=BaseRequest, default=Request, contravariant=True)
 _P = ParamSpec("_P")
 _P2 = ParamSpec("_P2")
 
-_RequestHandlerCallable: TypeAlias = Callable[Concatenate[_RequestT_contra, _P], _AnyResponse]
-_RequestHandlerMethod: TypeAlias = Callable[Concatenate[Any, _RequestT_contra, _P], _AnyResponse]
-_MiddlewareCallable: TypeAlias = Callable[Concatenate[_RequestT_contra, _AppT_contra, _P], _AnyResponse]
-_MiddlewareMethod: TypeAlias = Callable[Concatenate[Any, _RequestT_contra, _AppT_contra, _P], _AnyResponse]
-_RequestHandler: TypeAlias = _RequestHandlerCallable[_RequestT_contra, _P] | _RequestHandlerMethod[_RequestT_contra, _P]
-_Middleware: TypeAlias = (
-    _MiddlewareCallable[_RequestT_contra, _AppT_contra, _P] | _MiddlewareMethod[_RequestT_contra, _AppT_contra, _P]
-)
+_RequestHandlerCallable: TypeAlias = Callable[Concatenate[_RequestT, _P], _AnyResponse]
+_RequestHandlerMethod: TypeAlias = Callable[Concatenate[Any, _RequestT, _P], _AnyResponse]
+_MiddlewareCallable: TypeAlias = Callable[Concatenate[_RequestT, _AppT, _P], _AnyResponse]
+_MiddlewareMethod: TypeAlias = Callable[Concatenate[Any, _RequestT, _AppT, _P], _AnyResponse]
+_RequestHandler: TypeAlias = _RequestHandlerCallable[_RequestT, _P] | _RequestHandlerMethod[_RequestT, _P]
+_Middleware: TypeAlias = _MiddlewareCallable[_RequestT, _AppT, _P] | _MiddlewareMethod[_RequestT, _AppT, _P]
 
-class wsgify(Generic[_RequestT_contra, _P]):
-    RequestClass: type[Request]
+class wsgify(Generic[_P, _RequestT_contra]):
+    RequestClass: type[_RequestT_contra]
     func: _RequestHandler[_RequestT_contra, _P] | None
     args: tuple[Any, ...]
     kwargs: dict[str, Any]
     middleware_wraps: WSGIApplication | None
     # NOTE: We disallow passing args/kwargs using this direct API, because
     #       we can't really make it work as a decorator this way, these
-    #       arguments should only really be used indrectly through the
+    #       arguments should only really be used indirectly through the
     #       middleware decorator, where we can be more type safe
     @overload
     def __init__(
-        self: wsgify[Request, []],
+        self: wsgify[[], Request],
         func: _RequestHandler[Request, []] | None = None,
         RequestClass: None = None,
         args: tuple[()] = (),
@@ -45,7 +45,7 @@ class wsgify(Generic[_RequestT_contra, _P]):
     ) -> None: ...
     @overload
     def __init__(
-        self: wsgify[_RequestT_contra, []],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
+        self: wsgify[[], _RequestT_contra],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
         func: _RequestHandler[_RequestT_contra, []] | None,
         RequestClass: type[_RequestT_contra],
         args: tuple[()] = (),
@@ -54,7 +54,7 @@ class wsgify(Generic[_RequestT_contra, _P]):
     ) -> None: ...
     @overload
     def __init__(
-        self: wsgify[_RequestT_contra, []],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
+        self: wsgify[[], _RequestT_contra],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
         func: _RequestHandler[_RequestT_contra, []] | None = None,
         *,
         RequestClass: type[_RequestT_contra],
@@ -64,7 +64,7 @@ class wsgify(Generic[_RequestT_contra, _P]):
     ) -> None: ...
     @overload
     def __init__(
-        self: wsgify[Request, [_AppT_contra]],
+        self: wsgify[[_AppT_contra], Request],
         func: _Middleware[Request, _AppT_contra, []] | None = None,
         RequestClass: None = None,
         args: tuple[()] = (),
@@ -74,7 +74,7 @@ class wsgify(Generic[_RequestT_contra, _P]):
     ) -> None: ...
     @overload
     def __init__(
-        self: wsgify[_RequestT_contra, [_AppT_contra]],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
+        self: wsgify[[_AppT_contra], _RequestT_contra],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
         func: _Middleware[_RequestT_contra, _AppT_contra, []] | None,
         RequestClass: type[_RequestT_contra],
         args: tuple[()] = (),
@@ -84,7 +84,7 @@ class wsgify(Generic[_RequestT_contra, _P]):
     ) -> None: ...
     @overload
     def __init__(
-        self: wsgify[_RequestT_contra, [_AppT_contra]],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
+        self: wsgify[[_AppT_contra], _RequestT_contra],  # pyright: ignore[reportInvalidTypeVarUse]  #11780
         func: _Middleware[_RequestT_contra, _AppT_contra, []] | None = None,
         *,
         RequestClass: type[_RequestT_contra],
@@ -93,7 +93,7 @@ class wsgify(Generic[_RequestT_contra, _P]):
         middleware_wraps: _AppT_contra,
     ) -> None: ...
     @overload
-    def __get__(self, obj: None, type: type[_S]) -> _unbound_wsgify[_RequestT_contra, _P, _S]: ...
+    def __get__(self, obj: None, type: type[_S]) -> _unbound_wsgify[_P, _S, _RequestT_contra]: ...
     @overload
     def __get__(self, obj: object, type: type | None = None) -> Self: ...
     @overload
@@ -118,34 +118,34 @@ class wsgify(Generic[_RequestT_contra, _P]):
     @classmethod
     def middleware(
         cls, middle_func: None = None, app: None | _AppT = None, *_: _P.args, **kw: _P.kwargs
-    ) -> _UnboundMiddleware[Any, _AppT, _P]: ...
+    ) -> _UnboundMiddleware[_P, _AppT, Any]: ...
     @overload
     @classmethod
     def middleware(
         cls, middle_func: _MiddlewareCallable[_RequestT, _AppT, _P2], app: None = None
-    ) -> _MiddlewareFactory[_RequestT, _AppT, _P2]: ...
+    ) -> _MiddlewareFactory[_P2, _AppT, _RequestT]: ...
     @overload
     @classmethod
     def middleware(
         cls, middle_func: _MiddlewareMethod[_RequestT, _AppT, _P2], app: None = None
-    ) -> _MiddlewareFactory[_RequestT, _AppT, _P2]: ...
+    ) -> _MiddlewareFactory[_P2, _AppT, _RequestT]: ...
     @overload
     @classmethod
     def middleware(
         cls, middle_func: _MiddlewareMethod[_RequestT, _AppT, _P2], app: None = None, *_: _P2.args, **kw: _P2.kwargs
-    ) -> _MiddlewareFactory[_RequestT, _AppT, _P2]: ...
+    ) -> _MiddlewareFactory[_P2, _AppT, _RequestT]: ...
     @overload
     @classmethod
     def middleware(
         cls, middle_func: _MiddlewareMethod[_RequestT, _AppT, _P2], app: _AppT
-    ) -> type[wsgify[_RequestT, Concatenate[_AppT, _P2]]]: ...
+    ) -> type[wsgify[Concatenate[_AppT, _P2], _RequestT]]: ...
     @overload
     @classmethod
     def middleware(
         cls, middle_func: _MiddlewareMethod[_RequestT, _AppT, _P2], app: _AppT, *_: _P2.args, **kw: _P2.kwargs
-    ) -> type[wsgify[_RequestT, Concatenate[_AppT, _P2]]]: ...
+    ) -> type[wsgify[Concatenate[_AppT, _P2], _RequestT]]: ...
 
-class _unbound_wsgify(wsgify[_RequestT_contra, _P], Generic[_RequestT_contra, _P, _S]):
+class _unbound_wsgify(wsgify[_P, _RequestT_contra], Generic[_P, _S, _RequestT_contra]):
     @overload  # type: ignore[override]
     def __call__(self, __self: _S, env: WSGIEnvironment, /, start_response: StartResponse) -> Iterable[bytes]: ...
     @overload
@@ -155,13 +155,13 @@ class _unbound_wsgify(wsgify[_RequestT_contra, _P], Generic[_RequestT_contra, _P
     @overload
     def __call__(self, __self: _S, /, req: _RequestT_contra, *args: _P.args, **kw: _P.kwargs) -> _AnyResponse: ...
 
-class _UnboundMiddleware(Generic[_RequestT_contra, _AppT_contra, _P]):
-    wrapper_class: type[wsgify[_RequestT_contra, Concatenate[_AppT_contra, _P]]]
+class _UnboundMiddleware(Generic[_P, _AppT_contra, _RequestT_contra]):
+    wrapper_class: type[wsgify[Concatenate[_AppT_contra, _P], _RequestT_contra]]
     app: _AppT_contra | None
     kw: dict[str, Any]
     def __init__(
         self,
-        wrapper_class: type[wsgify[_RequestT_contra, Concatenate[_AppT_contra, _P]]],
+        wrapper_class: type[wsgify[Concatenate[_AppT_contra, _P], _RequestT_contra]],
         app: _AppT_contra | None,
         kw: dict[str, Any],
     ) -> None: ...
@@ -170,19 +170,19 @@ class _UnboundMiddleware(Generic[_RequestT_contra, _AppT_contra, _P]):
     @overload
     def __call__(
         self, func: _Middleware[_RequestT_contra, _AppT_contra, _P], app: None = None
-    ) -> wsgify[_RequestT_contra, Concatenate[_AppT_contra, _P]]: ...
+    ) -> wsgify[Concatenate[_AppT_contra, _P], _RequestT_contra]: ...
     @overload
     def __call__(
         self, func: _Middleware[_RequestT_contra, _AppT_contra, _P], app: _AppT_contra
-    ) -> wsgify[_RequestT_contra, Concatenate[_AppT_contra, _P]]: ...
+    ) -> wsgify[Concatenate[_AppT_contra, _P], _RequestT_contra]: ...
 
-class _MiddlewareFactory(Generic[_RequestT_contra, _AppT_contra, _P]):
-    wrapper_class: type[wsgify[_RequestT_contra, Concatenate[_AppT_contra, _P]]]
+class _MiddlewareFactory(Generic[_P, _AppT_contra, _RequestT_contra]):
+    wrapper_class: type[wsgify[Concatenate[_AppT_contra, _P], _RequestT_contra]]
     middleware: _Middleware[_RequestT_contra, _AppT_contra, _P]
     kw: dict[str, Any]
     def __init__(
         self,
-        wrapper_class: type[wsgify[_RequestT_contra, Concatenate[_AppT_contra, _P]]],
+        wrapper_class: type[wsgify[Concatenate[_AppT_contra, _P], _RequestT_contra]],
         middleware: _Middleware[_RequestT_contra, _AppT_contra, _P],
         kw: dict[str, Any],
     ) -> None: ...
@@ -191,6 +191,6 @@ class _MiddlewareFactory(Generic[_RequestT_contra, _AppT_contra, _P]):
     @overload
     def __call__(
         self, app: None = None, *_: _P.args, **config: _P.kwargs
-    ) -> _MiddlewareFactory[_RequestT_contra, _AppT_contra, []]: ...
+    ) -> _MiddlewareFactory[[], _AppT_contra, _RequestT_contra]: ...
     @overload
-    def __call__(self, app: _AppT_contra, *_: _P.args, **config: _P.kwargs) -> wsgify[_RequestT_contra, [_AppT_contra]]: ...
+    def __call__(self, app: _AppT_contra, *_: _P.args, **config: _P.kwargs) -> wsgify[[_AppT_contra], _RequestT_contra]: ...