Refs #34462 -- Removed ModelAdmin.log_deletion() and LogEntryManager.log_action() per deprecation timeline.

2 files changed, 0 insertions, 83 deletions

diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py
index bb81be8297..5723ebff7f 100644
--- a/django/contrib/admin/models.py
+++ b/django/contrib/admin/models.py
@@ -1,5 +1,4 @@
 import json
-import warnings
 
 from django.conf import settings
 from django.contrib.admin.utils import quote
@@ -7,7 +6,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
-from django.utils.deprecation import RemovedInDjango60Warning
 from django.utils.text import get_text_list
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
@@ -26,56 +24,9 @@ ACTION_FLAG_CHOICES = [
 class LogEntryManager(models.Manager):
     use_in_migrations = True
 
-    def log_action(
-        self,
-        user_id,
-        content_type_id,
-        object_id,
-        object_repr,
-        action_flag,
-        change_message="",
-    ):
-        warnings.warn(
-            "LogEntryManager.log_action() is deprecated. Use log_actions() instead.",
-            RemovedInDjango60Warning,
-            stacklevel=2,
-        )
-        if isinstance(change_message, list):
-            change_message = json.dumps(change_message)
-        return self.model.objects.create(
-            user_id=user_id,
-            content_type_id=content_type_id,
-            object_id=str(object_id),
-            object_repr=object_repr[:200],
-            action_flag=action_flag,
-            change_message=change_message,
-        )
-
     def log_actions(
         self, user_id, queryset, action_flag, change_message="", *, single_object=False
     ):
-        # RemovedInDjango60Warning.
-        if type(self).log_action != LogEntryManager.log_action:
-            warnings.warn(
-                "The usage of log_action() is deprecated. Implement log_actions() "
-                "instead.",
-                RemovedInDjango60Warning,
-                stacklevel=2,
-            )
-            return [
-                self.log_action(
-                    user_id=user_id,
-                    content_type_id=ContentType.objects.get_for_model(
-                        obj, for_concrete_model=False
-                    ).id,
-                    object_id=obj.pk,
-                    object_repr=str(obj),
-                    action_flag=action_flag,
-                    change_message=change_message,
-                )
-                for obj in queryset
-            ]
-
         if isinstance(change_message, list):
             change_message = json.dumps(change_message)
 
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 25987171bf..3c2cf9d130 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -2,7 +2,6 @@ import copy
 import enum
 import json
 import re
-import warnings
 from functools import partial, update_wrapper
 from urllib.parse import parse_qsl
 from urllib.parse import quote as urlquote
@@ -56,7 +55,6 @@ from django.http.response import HttpResponseBase
 from django.template.response import SimpleTemplateResponse, TemplateResponse
 from django.urls import reverse
 from django.utils.decorators import method_decorator
-from django.utils.deprecation import RemovedInDjango60Warning
 from django.utils.html import format_html
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
@@ -967,28 +965,6 @@ class ModelAdmin(BaseModelAdmin):
             single_object=True,
         )
 
-    def log_deletion(self, request, obj, object_repr):
-        """
-        Log that an object will be deleted. Note that this method must be
-        called before the deletion.
-
-        The default implementation creates an admin LogEntry object.
-        """
-        warnings.warn(
-            "ModelAdmin.log_deletion() is deprecated. Use log_deletions() instead.",
-            RemovedInDjango60Warning,
-            stacklevel=2,
-        )
-        from django.contrib.admin.models import DELETION, LogEntry
-
-        return LogEntry.objects.log_action(
-            user_id=request.user.pk,
-            content_type_id=get_content_type_for_model(obj).pk,
-            object_id=obj.pk,
-            object_repr=object_repr,
-            action_flag=DELETION,
-        )
-
     def log_deletions(self, request, queryset):
         """
         Log that objects will be deleted. Note that this method must be called
@@ -998,16 +974,6 @@ class ModelAdmin(BaseModelAdmin):
         """
         from django.contrib.admin.models import DELETION, LogEntry
 
-        # RemovedInDjango60Warning.
-        if type(self).log_deletion != ModelAdmin.log_deletion:
-            warnings.warn(
-                "The usage of log_deletion() is deprecated. Implement log_deletions() "
-                "instead.",
-                RemovedInDjango60Warning,
-                stacklevel=2,
-            )
-            return [self.log_deletion(request, obj, str(obj)) for obj in queryset]
-
         return LogEntry.objects.log_actions(
             user_id=request.user.pk,
             queryset=queryset,