Undeprecate the TemplateMixin

matthiask · matthiask · commit dd5925617b18 · 2025-01-28T18:21:11.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,6 +7,9 @@ Next version
 ~~~~~~~~~~~~
 
 - Added Django 5.2a1 to the CI.
+- Undeprecated the :mod:`~feincms3.mixins.TemplateMixin`, it's useful even
+  though using :mod:`~feincms3.applications.PageTypeMixin` is obviously
+  preferred.
 
 
 5.3 (2024-11-18)
@@ -201,8 +204,8 @@ Next version
 - Added a system check for the ``app_name`` value of application URLconf
   modules.
 - Added a system check for the values of ``MenuMixin.MENUS``.
-- Slowly start deprecating the :mod:`~feincms3.mixins.TemplateMixin`. (It
-  probably won't go away for a long time.)
+- Slowly start deprecating the :mod:`~feincms3.mixins.TemplateMixin`. (NOTE!
+  The deprecation has been reverted.)
 
 
 `3.3`_ (2022-03-03)
diff --git a/feincms3/mixins.py b/feincms3/mixins.py
@@ -1,5 +1,3 @@
-import warnings
-
 from django.conf import settings
 from django.core.checks import Warning
 from django.db import models
@@ -102,15 +100,6 @@ def fill_template_key_choices(sender, **kwargs):
             field.default = sender.TEMPLATES[0].key
             sender.TEMPLATES_DICT = {t.key: t for t in sender.TEMPLATES}
 
-            warnings.warn(
-                f"{sender._meta.label} uses the TemplateMixin."
-                " It is recommended to use the PageTypeMixin and TemplateType"
-                " from feincms3.applications even if you're not planning to use"
-                " any apps.",
-                DeprecationWarning,
-                stacklevel=1,
-            )
-
 
 signals.class_prepared.connect(TemplateMixin.fill_template_key_choices)
 
