Refs #32339 -- Changed default form and formset rendering style to div-based.

Per deprecation timeline.

This also removes "django/forms/default.html" and
"django/forms/formsets/default.html" templates.

7 files changed, 2 insertions, 31 deletions

diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index f14e1aae83..235aaf844c 100644
--- a/django/forms/formsets.py
+++ b/django/forms/formsets.py
@@ -32,8 +32,6 @@ class ManagementForm(Form):
     as well.
     """
 
-    template_name = "django/forms/div.html"  # RemovedInDjango50Warning.
-
     TOTAL_FORMS = IntegerField(widget=HiddenInput)
     INITIAL_FORMS = IntegerField(widget=HiddenInput)
     # MIN_NUM_FORM_COUNT and MAX_NUM_FORM_COUNT are output with the rest of the
diff --git a/django/forms/jinja2/django/forms/default.html b/django/forms/jinja2/django/forms/default.html
deleted file mode 100644
index d034b60d57..0000000000
--- a/django/forms/jinja2/django/forms/default.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include "django/forms/table.html" %}
diff --git a/django/forms/jinja2/django/forms/formsets/default.html b/django/forms/jinja2/django/forms/formsets/default.html
deleted file mode 100644
index d8284c5da1..0000000000
--- a/django/forms/jinja2/django/forms/formsets/default.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ formset.management_form }}{% for form in formset %}{{ form }}{% endfor %}
diff --git a/django/forms/renderers.py b/django/forms/renderers.py
index 43340c6c88..d53a7c633d 100644
--- a/django/forms/renderers.py
+++ b/django/forms/renderers.py
@@ -15,11 +15,8 @@ def get_default_renderer():
 
 
 class BaseRenderer:
-    # RemovedInDjango50Warning: When the deprecation ends, replace with
-    # form_template_name = "django/forms/div.html"
-    # formset_template_name = "django/forms/formsets/div.html"
-    form_template_name = "django/forms/default.html"
-    formset_template_name = "django/forms/formsets/default.html"
+    form_template_name = "django/forms/div.html"
+    formset_template_name = "django/forms/formsets/div.html"
 
     def get_template(self, template_name):
         raise NotImplementedError("subclasses must implement get_template()")
diff --git a/django/forms/templates/django/forms/default.html b/django/forms/templates/django/forms/default.html
deleted file mode 100644
index d034b60d57..0000000000
--- a/django/forms/templates/django/forms/default.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include "django/forms/table.html" %}
diff --git a/django/forms/templates/django/forms/formsets/default.html b/django/forms/templates/django/forms/formsets/default.html
deleted file mode 100644
index d8284c5da1..0000000000
--- a/django/forms/templates/django/forms/formsets/default.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ formset.management_form }}{% for form in formset %}{{ form }}{% endfor %}
diff --git a/django/forms/utils.py b/django/forms/utils.py
index 7577c0bbda..e0888b6e85 100644
--- a/django/forms/utils.py
+++ b/django/forms/utils.py
@@ -1,16 +1,13 @@
 import json
-import warnings
 from collections import UserList
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.forms.renderers import get_default_renderer
 from django.utils import timezone
-from django.utils.deprecation import RemovedInDjango50Warning
 from django.utils.html import escape, format_html_join
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
-from django.utils.version import get_docs_version
 
 
 def pretty_name(name):
@@ -45,16 +42,6 @@ def flatatt(attrs):
     )
 
 
-DEFAULT_TEMPLATE_DEPRECATION_MSG = (
-    'The "default.html" templates for forms and formsets will be removed. These were '
-    'proxies to the equivalent "table.html" templates, but the new "div.html" '
-    "templates will be the default from Django 5.0. Transitional renderers are "
-    "provided to allow you to opt-in to the new output style now. See "
-    "https://docs.djangoproject.com/en/%s/releases/4.1/ for more details"
-    % get_docs_version()
-)
-
-
 class RenderableMixin:
     def get_context(self):
         raise NotImplementedError(
@@ -65,13 +52,6 @@ class RenderableMixin:
         renderer = renderer or self.renderer
         template = template_name or self.template_name
         context = context or self.get_context()
-        if (
-            template == "django/forms/default.html"
-            or template == "django/forms/formsets/default.html"
-        ):
-            warnings.warn(
-                DEFAULT_TEMPLATE_DEPRECATION_MSG, RemovedInDjango50Warning, stacklevel=2
-            )
         return mark_safe(renderer.render(template, context))
 
     __str__ = render