Django 6.0: update ModelAdmin log_deletion(), lookup_allowed()

django-stubs/contrib/admin/options.pyi

@@ -1,6 +1,6 @@
 import enum
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
-from typing import Any, ClassVar, Generic, Literal, TypeAlias, TypeVar, cast, overload, type_check_only
+from typing import Any, ClassVar, Generic, Literal, TypeAlias, TypeVar, cast, type_check_only
 
 from django import forms
 from django.contrib.admin.filters import FieldListFilter, ListFilter
@@ -129,11 +129,11 @@ class BaseModelAdmin(Generic[_ModelT], metaclass=MediaDefiningClass):
     def get_prepopulated_fields(self, request: HttpRequest, obj: _ModelT | None = ...) -> dict[str, Sequence[str]]: ...
     def get_queryset(self, request: HttpRequest) -> QuerySet[_ModelT]: ...
     def get_sortable_by(self, request: HttpRequest) -> _ListDisplayT[_ModelT]: ...
-    @overload
-    @deprecated("None value for the request parameter will be removed in Django 6.0.")
-    def lookup_allowed(self, lookup: str, value: str, request: None = None) -> bool: ...
-    @overload
+    # @overload
+    # @deprecated("None value for the request parameter will be removed in Django 6.0.")
     def lookup_allowed(self, lookup: str, value: str, request: HttpRequest) -> bool: ...
+    # @overload
+    # def lookup_allowed(self, lookup: str, value: str, request: HttpRequest) -> bool: ...
     def to_field_allowed(self, request: HttpRequest, to_field: str) -> bool: ...
     def has_add_permission(self, request: HttpRequest) -> bool: ...
     def has_change_permission(self, request: HttpRequest, obj: _ModelT | None = ...) -> bool: ...
@@ -210,7 +210,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
     def log_addition(self, request: HttpRequest, obj: _ModelT, message: Any) -> LogEntry: ...
     def log_change(self, request: HttpRequest, obj: _ModelT, message: Any) -> LogEntry: ...
     @deprecated("log_deletion() is deprecated and will be removed in Django 6.0. Use log_deletions() instead.")
-    def log_deletion(self, request: HttpRequest, obj: _ModelT, object_repr: str) -> LogEntry: ...
+    def log_deletion(self, request: HttpRequest, object: Any, object_repr: str) -> LogEntry: ...
     def log_deletions(self, request: HttpRequest, queryset: QuerySet[_ModelT]) -> list[LogEntry] | LogEntry: ...
     def action_checkbox(self, obj: _ModelT) -> SafeString: ...
     def get_actions(self, request: HttpRequest) -> dict[str, tuple[Callable[..., str], str, str] | None]: ...

scripts/stubtest/allowlist_todo_django60.txt

@@ -5,8 +5,6 @@ django.conf.global_settings.URLIZE_ASSUME_HTTPS
 django.contrib.admin.AdminSite.password_change_form
 django.contrib.admin.ModelAdmin.log_deletion
 django.contrib.admin.models.LogEntryManager.log_action
-django.contrib.admin.options.BaseModelAdmin.lookup_allowed
-django.contrib.admin.options.ModelAdmin.log_deletion
 django.contrib.admin.sites.AdminSite.password_change_form
 django.contrib.admin.tests.AdminSeleniumTestCase.trigger_resize
 django.contrib.admin.tests.CSPMiddleware