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.

3 files changed, 3 insertions, 46 deletions

diff --git a/tests/forms_tests/tests/__init__.py b/tests/forms_tests/tests/__init__.py
index 1878eaf6e5..193a7149a1 100644
--- a/tests/forms_tests/tests/__init__.py
+++ b/tests/forms_tests/tests/__init__.py
@@ -11,8 +11,6 @@ except ImportError:
 def jinja2_tests(test_func):
     test_func = skipIf(jinja2 is None, "this test requires jinja2")(test_func)
     return override_settings(
-        # RemovedInDjango50Warning: When the deprecation ends, revert to
-        # FORM_RENDERER="django.forms.renderers.Jinja2",
-        FORM_RENDERER="django.forms.renderers.Jinja2DivFormRenderer",
+        FORM_RENDERER="django.forms.renderers.Jinja2",
         TEMPLATES={"BACKEND": "django.template.backends.jinja2.Jinja2"},
     )(test_func)
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index 930a200b14..14e3755b68 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -42,9 +42,8 @@ from django.forms.utils import ErrorList
 from django.http import QueryDict
 from django.template import Context, Template
 from django.test import SimpleTestCase
-from django.test.utils import isolate_lru_cache, override_settings
+from django.test.utils import override_settings
 from django.utils.datastructures import MultiValueDict
-from django.utils.deprecation import RemovedInDjango50Warning
 from django.utils.safestring import mark_safe
 
 from . import jinja2_tests
@@ -5084,16 +5083,3 @@ class OverrideTests(SimpleTestCase):
             '<label for="id_name" class="required">Name:</label>'
             '<legend class="required">Language:</legend>',
         )
-
-
-class DeprecationTests(SimpleTestCase):
-    def test_warning(self):
-        from django.forms.utils import DEFAULT_TEMPLATE_DEPRECATION_MSG
-
-        with isolate_lru_cache(get_default_renderer), self.settings(
-            FORM_RENDERER="django.forms.renderers.DjangoTemplates"
-        ), self.assertRaisesMessage(
-            RemovedInDjango50Warning, DEFAULT_TEMPLATE_DEPRECATION_MSG
-        ):
-            form = Person()
-            str(form)
diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py
index f0e4b154b7..e2c695f0dc 100644
--- a/tests/forms_tests/tests/test_formsets.py
+++ b/tests/forms_tests/tests/test_formsets.py
@@ -23,12 +23,10 @@ from django.forms.formsets import (
     all_valid,
     formset_factory,
 )
-from django.forms.renderers import TemplatesSetting, get_default_renderer
+from django.forms.renderers import TemplatesSetting
 from django.forms.utils import ErrorList
 from django.forms.widgets import HiddenInput
 from django.test import SimpleTestCase
-from django.test.utils import isolate_lru_cache
-from django.utils.deprecation import RemovedInDjango50Warning
 
 from . import jinja2_tests
 
@@ -1900,28 +1898,3 @@ class AllValidTests(SimpleTestCase):
         ]
         self.assertEqual(formset1._errors, expected_errors)
         self.assertEqual(formset2._errors, expected_errors)
-
-
-class DeprecationTests(SimpleTestCase):
-    def test_warning(self):
-        from django.forms.utils import DEFAULT_TEMPLATE_DEPRECATION_MSG
-
-        with isolate_lru_cache(get_default_renderer), self.settings(
-            FORM_RENDERER="django.forms.renderers.DjangoTemplates"
-        ), self.assertRaisesMessage(
-            RemovedInDjango50Warning, DEFAULT_TEMPLATE_DEPRECATION_MSG
-        ):
-            ChoiceFormSet = formset_factory(Choice)
-            formset = ChoiceFormSet()
-            str(formset)
-
-    def test_no_management_form_warning(self):
-        """
-        Management forms are already rendered with the new div template.
-        """
-        with isolate_lru_cache(get_default_renderer), self.settings(
-            FORM_RENDERER="django.forms.renderers.DjangoTemplates"
-        ):
-            ChoiceFormSet = formset_factory(Choice, formset=BaseFormSet)
-            formset = ChoiceFormSet()
-            str(formset.management_form)