From f3e0872d6e2a3e5fa7925c97855369e7ce9f2520 Mon Sep 17 00:00:00 2001 From: Alisue Date: Fri, 20 Nov 2020 00:38:59 +0900 Subject: [PATCH] Fix signature of RemoteUserBackend.configure_user (#532) * Fix signature of RemoteUserBackend.configure_user The function signature has changed from 2.1 on 2.2 but django-stubs did not follow that. https://github.com/django/django/blob/2.1.15/django/contrib/auth/backends.py#L163 https://github.com/django/django/blob/2.2/django/contrib/auth/backends.py#L177 * Use HttpRequest on request to make it more explicit --- django-stubs/contrib/auth/backends.pyi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django-stubs/contrib/auth/backends.pyi b/django-stubs/contrib/auth/backends.pyi index 3dbd88d..efad88d 100644 --- a/django-stubs/contrib/auth/backends.pyi +++ b/django-stubs/contrib/auth/backends.pyi @@ -4,6 +4,7 @@ from django.contrib.auth.base_user import AbstractBaseUser from django.contrib.auth.models import AnonymousUser, User, Permission from django.db.models.base import Model +from django.http.request import HttpRequest _AnyUser = Union[Model, AnonymousUser] @@ -11,7 +12,7 @@ UserModel: Any class BaseBackend: def authenticate( - self, request: Any, username: Optional[str] = ..., password: Optional[str] = ..., **kwargs: Any + self, request: HttpRequest, username: Optional[str] = ..., password: Optional[str] = ..., **kwargs: Any ) -> Optional[AbstractBaseUser]: ... def get_user(self, user_id: int) -> Optional[AbstractBaseUser]: ... def get_user_permissions(self, user_obj: _AnyUser, obj: Optional[Model] = ...) -> Set[str]: ... @@ -35,6 +36,6 @@ class AllowAllUsersModelBackend(ModelBackend): ... class RemoteUserBackend(ModelBackend): create_unknown_user: bool = ... def clean_username(self, username: str) -> str: ... - def configure_user(self, user: User) -> User: ... + def configure_user(self, request: HttpRequest, user: User) -> User: ... class AllowAllUsersRemoteUserBackend(RemoteUserBackend): ...