Skip to content

Commit fd2c9bc

Browse files
authored
Update django.contrib for Django 5.2 (#2611)
* Update django.contrib.auth for Django 5.2 Signed-off-by: SaJH <[email protected]> * Update django.contrib.contenttypes for Django 5.2 Signed-off-by: SaJH <[email protected]> --------- Signed-off-by: SaJH <[email protected]>
1 parent 8249ccd commit fd2c9bc

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

Diff for: django-stubs/contrib/auth/backends.pyi

+3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ class AllowAllUsersModelBackend(ModelBackend): ...
4343

4444
class RemoteUserBackend(ModelBackend):
4545
create_unknown_user: bool
46+
def authenticate(self, request: HttpRequest | None, remote_user: str) -> _User | None: ... # type: ignore[override]
47+
async def aauthenticate(self, request: HttpRequest | None, remote_user: str) -> _User | None: ... # type: ignore[override]
4648
def clean_username(self, username: str) -> str: ...
4749
def configure_user(self, request: HttpRequest, user: _UserType, created: bool = ...) -> _UserType: ...
50+
async def aconfigure_user(self, request: HttpRequest, user: _UserType, created: bool = ...) -> _UserType: ...
4851

4952
class AllowAllUsersRemoteUserBackend(RemoteUserBackend): ...

Diff for: django-stubs/contrib/auth/base_user.pyi

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class BaseUserManager(models.Manager[_T]):
1212
@classmethod
1313
def normalize_email(cls, email: str | None) -> str: ...
1414
def get_by_natural_key(self, username: str | None) -> _T: ...
15+
async def aget_by_natural_key(self, username: str | None) -> _T: ...
1516

1617
class AbstractBaseUser(models.Model):
1718
REQUIRED_FIELDS: ClassVar[list[str]]

Diff for: django-stubs/contrib/auth/middleware.pyi

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class LoginRequiredMiddleware(MiddlewareMixin):
3030
class RemoteUserMiddleware(MiddlewareMixin):
3131
header: str
3232
force_logout_if_no_header: bool
33-
def process_request(self, request: HttpRequest) -> None: ...
3433
def clean_username(self, username: str, request: HttpRequest) -> str: ...
3534

3635
class PersistentRemoteUserMiddleware(RemoteUserMiddleware):

Diff for: django-stubs/contrib/auth/models.pyi

+7
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class Permission(models.Model):
4343

4444
class GroupManager(models.Manager[Group]):
4545
def get_by_natural_key(self, name: str) -> Group: ...
46+
async def aget_by_natural_key(self, name: str) -> Group: ...
4647

4748
class Group(models.Model):
4849
objects: ClassVar[GroupManager]
@@ -55,9 +56,15 @@ class UserManager(BaseUserManager[_UserType]):
5556
def create_user(
5657
self, username: str, email: str | None = ..., password: str | None = ..., **extra_fields: Any
5758
) -> _UserType: ...
59+
async def acreate_user(
60+
self, username: str, email: str | None = ..., password: str | None = ..., **extra_fields: Any
61+
) -> _UserType: ...
5862
def create_superuser(
5963
self, username: str, email: str | None = ..., password: str | None = ..., **extra_fields: Any
6064
) -> _UserType: ...
65+
async def acreate_superuser(
66+
self, username: str, email: str | None = ..., password: str | None = ..., **extra_fields: Any
67+
) -> _UserType: ...
6168
def with_perm(
6269
self,
6370
perm: str | Permission,

Diff for: django-stubs/contrib/auth/password_validation.pyi

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class MinimumLengthValidator:
2626
def __init__(self, min_length: int = ...) -> None: ...
2727
def validate(self, password: str, user: _User | None = ...) -> None: ...
2828
def get_help_text(self) -> str: ...
29+
def get_error_message(self) -> str: ...
2930

3031
class UserAttributeSimilarityValidator:
3132
DEFAULT_USER_ATTRIBUTES: Sequence[str]
@@ -34,14 +35,17 @@ class UserAttributeSimilarityValidator:
3435
def __init__(self, user_attributes: Sequence[str] = ..., max_similarity: float = ...) -> None: ...
3536
def validate(self, password: str, user: _User | None = ...) -> None: ...
3637
def get_help_text(self) -> str: ...
38+
def get_error_message(self) -> str: ...
3739

3840
class CommonPasswordValidator:
3941
DEFAULT_PASSWORD_LIST_PATH: Path
4042
passwords: set[str]
4143
def __init__(self, password_list_path: Path | PosixPath | str = ...) -> None: ...
4244
def validate(self, password: str, user: _User | None = ...) -> None: ...
4345
def get_help_text(self) -> str: ...
46+
def get_error_message(self) -> str: ...
4447

4548
class NumericPasswordValidator:
4649
def validate(self, password: str, user: _User | None = ...) -> None: ...
4750
def get_help_text(self) -> str: ...
51+
def get_error_message(self) -> str: ...

Diff for: django-stubs/contrib/contenttypes/fields.pyi

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class GenericForeignKey(FieldCacheMixin):
4040
name: Any
4141
model: Any
4242
def contribute_to_class(self, cls: type[Model], name: str, **kwargs: Any) -> None: ...
43+
def get_attname_column(self) -> tuple[str, None]: ...
4344
def get_filter_kwargs_for_object(self, obj: Model) -> dict[str, ContentType | None]: ...
4445
def get_forward_related_filter(self, obj: Model) -> dict[str, int]: ...
4546
def check(self, **kwargs: Any) -> list[CheckMessage]: ...

Diff for: scripts/stubtest/allowlist_todo.txt

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ django.contrib.auth.admin.UserAdmin
6262
django.contrib.auth.admin.UserAdmin.fieldsets
6363
django.contrib.auth.admin.UserAdmin.form
6464
django.contrib.auth.admin.UserAdmin.get_form
65-
django.contrib.auth.backends.RemoteUserBackend.authenticate
6665
django.contrib.auth.base_user.AbstractBaseUser.last_login
6766
django.contrib.auth.base_user.AbstractBaseUser.password
6867
django.contrib.auth.decorators.login_required

Diff for: scripts/stubtest/allowlist_todo_django52.txt

-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
# Autogenerated by `stubtest`
22

33
# Created for 5.2 update:
4-
django.contrib.auth.backends.RemoteUserBackend.aauthenticate
5-
django.contrib.auth.backends.RemoteUserBackend.aconfigure_user
6-
django.contrib.auth.base_user.BaseUserManager.aget_by_natural_key
7-
django.contrib.auth.middleware.RemoteUserMiddleware.process_request
8-
django.contrib.auth.models.BaseUserManager.aget_by_natural_key
9-
django.contrib.auth.models.GroupManager.aget_by_natural_key
10-
django.contrib.auth.models.UserManager.acreate_superuser
11-
django.contrib.auth.models.UserManager.acreate_user
12-
django.contrib.auth.password_validation.CommonPasswordValidator.get_error_message
13-
django.contrib.auth.password_validation.MinimumLengthValidator.get_error_message
14-
django.contrib.auth.password_validation.NumericPasswordValidator.get_error_message
15-
django.contrib.auth.password_validation.UserAttributeSimilarityValidator.get_error_message
16-
django.contrib.contenttypes.fields.GenericForeignKey.get_attname_column
174
django.contrib.contenttypes.fields.GenericRelation.get_foreign_related_value
185
django.contrib.contenttypes.fields.GenericRelation.get_local_related_value
196
django.contrib.contenttypes.models.ContentType.get_object_for_this_type

0 commit comments

Comments
 (0)