From e2f2b41706eab260fdf37b693d2d9d792c2701c0 Mon Sep 17 00:00:00 2001
From: Marco Bonetti <marco@cruncher.ch>
Date: Tue, 19 Sep 2023 11:14:26 +0200
Subject: [PATCH] Testing against Django 5.0a and massive cleanup

---
 CHANGES                                       |  6 ++
 captcha/__init__.py                           |  2 +-
 captcha/conf/settings.py                      | 19 ----
 captcha/fields.py                             | 64 +-----------
 captcha/templates/captcha/field.html          |  1 -
 captcha/templates/captcha/hidden_field.html   |  1 -
 captcha/templates/captcha/image.html          |  4 -
 captcha/templates/captcha/text_field.html     |  1 -
 .../templates/captcha/widgets/captcha.html    |  2 +-
 captcha/tests/tests.py                        | 97 ++++++-------------
 docs/advanced.rst                             | 43 +-------
 docs/conf.py                                  |  4 +-
 testproject/forms.py                          | 10 +-
 testproject/settings.py                       |  3 +-
 .../captcha_test/custom_captcha_field.html    | 17 ++++
 .../captcha_test/image_html5_audio.html       |  2 +-
 testproject/views.py                          |  2 +-
 tox.ini                                       | 52 +++-------
 18 files changed, 85 insertions(+), 245 deletions(-)
 delete mode 100644 captcha/templates/captcha/field.html
 delete mode 100644 captcha/templates/captcha/hidden_field.html
 delete mode 100644 captcha/templates/captcha/image.html
 delete mode 100644 captcha/templates/captcha/text_field.html
 create mode 100644 testproject/templates/captcha_test/custom_captcha_field.html

diff --git a/CHANGES b/CHANGES
index b59ea302..91e0dc10 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
 Version History
 ===============
 
+
+Version 0.6.0
+-------------
+* Only Django versions 4.2 or above are now supported
+* Removed the old rendering methods that were deprecated in 2017.
+
 Version 0.5.18
 --------------
 * Fix some typos in documentation (#210, thanks @stweil)
diff --git a/captcha/__init__.py b/captcha/__init__.py
index b0eaf290..bca8d0b0 100644
--- a/captcha/__init__.py
+++ b/captcha/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (0, 5, 18)
+VERSION = (0, 6, 0)
 
 
 def get_version():
diff --git a/captcha/conf/settings.py b/captcha/conf/settings.py
index f31cdd07..7cbbfeb4 100644
--- a/captcha/conf/settings.py
+++ b/captcha/conf/settings.py
@@ -1,5 +1,4 @@
 import os
-import warnings
 
 from django.conf import settings
 
@@ -36,24 +35,6 @@
 CAPTCHA_DICTIONARY_MIN_LENGTH = getattr(settings, "CAPTCHA_DICTIONARY_MIN_LENGTH", 0)
 CAPTCHA_DICTIONARY_MAX_LENGTH = getattr(settings, "CAPTCHA_DICTIONARY_MAX_LENGTH", 99)
 CAPTCHA_IMAGE_SIZE = getattr(settings, "CAPTCHA_IMAGE_SIZE", None)
-CAPTCHA_IMAGE_TEMPLATE = getattr(
-    settings, "CAPTCHA_IMAGE_TEMPLATE", "captcha/image.html"
-)
-CAPTCHA_HIDDEN_FIELD_TEMPLATE = getattr(
-    settings, "CAPTCHA_HIDDEN_FIELD_TEMPLATE", "captcha/hidden_field.html"
-)
-CAPTCHA_TEXT_FIELD_TEMPLATE = getattr(
-    settings, "CAPTCHA_TEXT_FIELD_TEMPLATE", "captcha/text_field.html"
-)
-
-if getattr(settings, "CAPTCHA_FIELD_TEMPLATE", None):
-    msg = "CAPTCHA_FIELD_TEMPLATE setting is deprecated in favor of widget's template_name."
-    warnings.warn(msg, DeprecationWarning)
-CAPTCHA_FIELD_TEMPLATE = getattr(settings, "CAPTCHA_FIELD_TEMPLATE", None)
-if getattr(settings, "CAPTCHA_OUTPUT_FORMAT", None):
-    msg = "CAPTCHA_OUTPUT_FORMAT setting is deprecated in favor of widget's template_name."
-    warnings.warn(msg, DeprecationWarning)
-CAPTCHA_OUTPUT_FORMAT = getattr(settings, "CAPTCHA_OUTPUT_FORMAT", None)
 
 CAPTCHA_MATH_CHALLENGE_OPERATOR = getattr(
     settings, "CAPTCHA_MATH_CHALLENGE_OPERATOR", "*"
diff --git a/captcha/fields.py b/captcha/fields.py
index 6aa4e59d..36c4fdca 100644
--- a/captcha/fields.py
+++ b/captcha/fields.py
@@ -1,14 +1,9 @@
-import warnings
-
-import django
 from django.core.exceptions import ImproperlyConfigured
 from django.forms import ValidationError
 from django.forms.fields import CharField, MultiValueField
 from django.forms.widgets import HiddenInput, MultiWidget, TextInput
-from django.template.loader import render_to_string
 from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
-from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy
 
 from captcha.conf import settings
@@ -97,34 +92,19 @@ def refresh_url(self):
 
 
 class CaptchaTextInput(BaseCaptchaTextInput):
-
     template_name = "captcha/widgets/captcha.html"
 
     def __init__(
         self,
         attrs=None,
-        field_template=None,
         id_prefix=None,
         generator=None,
-        output_format=None,
+        # output_format=None,
     ):
         self.id_prefix = id_prefix
         self.generator = generator
-        if field_template is not None:
-            msg = "CaptchaTextInput's field_template argument is deprecated in favor of widget's template_name."
-            warnings.warn(msg, DeprecationWarning)
-        self.field_template = field_template or settings.CAPTCHA_FIELD_TEMPLATE
-        if output_format is not None:
-            msg = "CaptchaTextInput's output_format argument is deprecated in favor of widget's template_name."
-            warnings.warn(msg, DeprecationWarning)
-        self.output_format = output_format or settings.CAPTCHA_OUTPUT_FORMAT
-        # Fallback to custom rendering in Django < 1.11
-        if (
-            not hasattr(self, "_render")
-            and self.field_template is None
-            and self.output_format is None
-        ):
-            self.field_template = "captcha/field.html"
+
+        self.output_format = None
 
         if self.output_format:
             for key in ("image", "hidden_field", "text_field"):
@@ -173,46 +153,11 @@ def format_output(self, rendered_widgets):
             }
             return ret
 
-        elif self.field_template:
-            context = {
-                "image": mark_safe(self.image_and_audio),
-                "hidden_field": mark_safe(self.hidden_field),
-                "text_field": mark_safe(self.text_field),
-            }
-            return render_to_string(self.field_template, context)
-
-    def _direct_render(self, name, attrs):
-        """Render the widget the old way - using field_template or output_format."""
-        context = {
-            "image": self.image_url(),
-            "name": name,
-            "key": self._key,
-            "id": "%s_%s" % (self.id_prefix, attrs.get("id"))
-            if self.id_prefix
-            else attrs.get("id"),
-            "audio": self.audio_url(),
-        }
-        self.image_and_audio = render_to_string(
-            settings.CAPTCHA_IMAGE_TEMPLATE, context
-        )
-        self.hidden_field = render_to_string(
-            settings.CAPTCHA_HIDDEN_FIELD_TEMPLATE, context
-        )
-        self.text_field = render_to_string(
-            settings.CAPTCHA_TEXT_FIELD_TEMPLATE, context
-        )
-        return self.format_output(None)
-
     def render(self, name, value, attrs=None, renderer=None):
         self.fetch_captcha_store(name, value, attrs, self.generator)
 
-        if self.field_template or self.output_format:
-            return self._direct_render(name, attrs)
-
         extra_kwargs = {}
-        if django.VERSION >= (1, 11):
-            # https://docs.djangoproject.com/en/1.11/ref/forms/widgets/#django.forms.Widget.render
-            extra_kwargs["renderer"] = renderer
+        extra_kwargs["renderer"] = renderer
 
         return super(CaptchaTextInput, self).render(
             name, self._value, attrs=attrs, **extra_kwargs
@@ -234,7 +179,6 @@ def __init__(self, *args, **kwargs):
         kwargs["widget"] = kwargs.pop(
             "widget",
             CaptchaTextInput(
-                output_format=kwargs.pop("output_format", None),
                 id_prefix=kwargs.pop("id_prefix", None),
                 generator=kwargs.pop("generator", None),
             ),
diff --git a/captcha/templates/captcha/field.html b/captcha/templates/captcha/field.html
deleted file mode 100644
index 8c5d5d61..00000000
--- a/captcha/templates/captcha/field.html
+++ /dev/null
@@ -1 +0,0 @@
-{{image}}{{hidden_field}}{{text_field}}
diff --git a/captcha/templates/captcha/hidden_field.html b/captcha/templates/captcha/hidden_field.html
deleted file mode 100644
index 36d7490a..00000000
--- a/captcha/templates/captcha/hidden_field.html
+++ /dev/null
@@ -1 +0,0 @@
-<input id="{{id}}_0" name="{{name}}_0" type="hidden" value="{{key}}" />
diff --git a/captcha/templates/captcha/image.html b/captcha/templates/captcha/image.html
deleted file mode 100644
index a73e956e..00000000
--- a/captcha/templates/captcha/image.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load i18n %}
-{% spaceless %}
-    {% if audio %}<a title="{% trans "Play CAPTCHA as audio file" %}" href="{{audio}}">{% endif %}<img src="{{image}}" alt="captcha" class="captcha" />{% if audio %}</a>{% endif %}
-{% endspaceless %}
diff --git a/captcha/templates/captcha/text_field.html b/captcha/templates/captcha/text_field.html
deleted file mode 100644
index fee60f44..00000000
--- a/captcha/templates/captcha/text_field.html
+++ /dev/null
@@ -1 +0,0 @@
-<input autocapitalize="off" autocomplete="off" autocorrect="off" spellcheck="false" id="{{id}}_1" name="{{name}}_1" type="text" />
diff --git a/captcha/templates/captcha/widgets/captcha.html b/captcha/templates/captcha/widgets/captcha.html
index 49faaf25..e9000d5f 100644
--- a/captcha/templates/captcha/widgets/captcha.html
+++ b/captcha/templates/captcha/widgets/captcha.html
@@ -6,4 +6,4 @@
     <img src="{{ image }}" alt="captcha" class="captcha" />
     {% if audio %}</a>{% endif %}
 {% endspaceless %}
-{% include "django/forms/widgets/multiwidget.html" %}
+{% spaceless %}{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %}{% endspaceless %}
diff --git a/captcha/tests/tests.py b/captcha/tests/tests.py
index 9d0f7158..86061afe 100644
--- a/captcha/tests/tests.py
+++ b/captcha/tests/tests.py
@@ -2,7 +2,6 @@
 import json
 import os
 import re
-import warnings
 from io import BytesIO
 
 from PIL import Image
@@ -17,16 +16,13 @@
 from django.utils.translation import gettext_lazy
 
 from captcha.conf import settings
-from captcha.fields import CaptchaField, CaptchaTextInput
 from captcha.models import CaptchaStore
 
 
 @override_settings(ROOT_URLCONF="captcha.tests.urls")
 class CaptchaCase(TestCase):
     def setUp(self):
-
         self.stores = {}
-        self.__current_settings_output_format = settings.CAPTCHA_OUTPUT_FORMAT
         self.__current_settings_dictionary = settings.CAPTCHA_WORDS_DICTIONARY
         self.__current_settings_punctuation = settings.CAPTCHA_PUNCTUATION
 
@@ -57,7 +53,6 @@ def setUp(self):
         self.default_store = self.stores["default_store"]
 
     def tearDown(self):
-        settings.CAPTCHA_OUTPUT_FORMAT = self.__current_settings_output_format
         settings.CAPTCHA_WORDS_DICTIONARY = self.__current_settings_dictionary
         settings.CAPTCHA_PUNCTUATION = self.__current_settings_punctuation
 
@@ -273,47 +268,11 @@ def test_repeated_challenge_form_submit(self):
             self.assertTrue(str(r2.content).find("Form validated") > 0)
         settings.CAPTCHA_CHALLENGE_FUNCT = __current_challange_function
 
-    def test_output_format(self):
-        for urlname in ("captcha-test", "captcha-test-model-form"):
-            settings.CAPTCHA_OUTPUT_FORMAT = (
-                "%(image)s<p>Hello, captcha world</p>%(hidden_field)s%(text_field)s"
-            )
-            r = self.client.get(reverse(urlname))
-            self.assertEqual(r.status_code, 200)
-            self.assertTrue("<p>Hello, captcha world</p>" in str(r.content))
-
-    def test_invalid_output_format(self):
-        for urlname in ("captcha-test", "captcha-test-model-form"):
-            settings.CAPTCHA_OUTPUT_FORMAT = "%(image)s"
-            try:
-                with warnings.catch_warnings(record=True) as w:
-                    self.client.get(reverse(urlname))
-                    assert len(w) == 1
-                    self.assertTrue("CAPTCHA_OUTPUT_FORMAT" in str(w[-1].message))
-                    self.fail()
-
-            except ImproperlyConfigured as e:
-                self.assertTrue("CAPTCHA_OUTPUT_FORMAT" in str(e))
-
-    def test_per_form_format(self):
-        settings.CAPTCHA_OUTPUT_FORMAT = (
-            "%(image)s testCustomFormatString %(hidden_field)s %(text_field)s"
-        )
-        r = self.client.get(reverse("captcha-test"))
-        self.assertTrue("testCustomFormatString" in str(r.content))
-        r = self.client.get(reverse("test_per_form_format"))
-        self.assertTrue("testPerFieldCustomFormatString" in str(r.content))
-
     def test_custom_generator(self):
         r = self.client.get(reverse("test_custom_generator"))
         hash_, response = self.__extract_hash_and_response(r)
         self.assertEqual(response, "111111")
 
-    def test_issue31_proper_abel(self):
-        settings.CAPTCHA_OUTPUT_FORMAT = "%(image)s %(hidden_field)s %(text_field)s"
-        r = self.client.get(reverse("captcha-test"))
-        self.assertTrue('<label for="id_captcha_1"' in str(r.content))
-
     def test_refresh_view(self):
         r = self.client.get(
             reverse("captcha-refresh"), HTTP_X_REQUESTED_WITH="XMLHttpRequest"
@@ -332,15 +291,6 @@ def test_content_length(self):
             self.assertTrue(response["content-length"].isdigit())
             self.assertTrue(int(response["content-length"]))
 
-    def test_issue12_proper_instantiation(self):
-        """
-        This test covers a default django field and widget behavior
-        It not assert anything. If something is wrong it will raise a error!
-        """
-        settings.CAPTCHA_OUTPUT_FORMAT = "%(image)s %(hidden_field)s %(text_field)s"
-        widget = CaptchaTextInput(attrs={"class": "required"})
-        CaptchaField(widget=widget)
-
     def test_test_mode_issue15(self):
         __current_test_mode_setting = settings.CAPTCHA_TEST_MODE
         settings.CAPTCHA_TEST_MODE = False
@@ -424,9 +374,17 @@ def test_missing_value(self):
     def test_autocomplete_off(self):
         r = self.client.get(reverse("captcha-test"))
         captcha_input = (
-            '<input type="text" name="captcha_1" autocomplete="off" spellcheck="false" autocorrect="off" '
+            '<input type="text" name="captcha_1" autocomplete="off" '
+            'spellcheck="false" autocorrect="off" '
             'autocapitalize="off" id="id_captcha_1" required />'
         )
+        if django.VERSION >= (5, 0):
+            captcha_input = (
+                '<input type="text" name="captcha_1" autocomplete="off" '
+                'spellcheck="false" autocorrect="off" '
+                'autocapitalize="off" id="id_captcha_1" '
+                'required aria-describedby="id_captcha_1_helptext" />'
+            )
         self.assertContains(r, captcha_input, html=True)
 
     def test_issue201_autocomplete_off_on_hiddeninput(self):
@@ -436,12 +394,24 @@ def test_issue201_autocomplete_off_on_hiddeninput(self):
         key = r.context["form"]["captcha"].field.widget._key
 
         # Assety that autocomplete=off is set on the hidden captcha field.
-        self.assertInHTML(
-            '<input type="hidden" name="captcha_0" value="{}" id="id_captcha_0" autocomplete="off" required />'.format(
-                key
-            ),
-            str(r.content),
-        )
+        if django.VERSION >= (5, 0):
+            self.assertInHTML(
+                (
+                    f'<input type="hidden" name="captcha_0" value="{key}" '
+                    'id="id_captcha_0" autocomplete="off" '
+                    'aria-describedby="id_captcha_1_helptext" required />'
+                ),
+                str(r.content),
+            )
+
+        else:
+            self.assertInHTML(
+                (
+                    f'<input type="hidden" name="captcha_0" value="{key}" '
+                    'id="id_captcha_0" autocomplete="off" required />'
+                ),
+                str(r.content),
+            )
 
     def test_transparent_background(self):
         __current_test_mode_setting = settings.CAPTCHA_BACKGROUND_COLOR
@@ -513,19 +483,6 @@ def test_multiple_fonts(self):
 
         settings.CAPTCHA_FONT_PATH = __current_test_mode_setting
 
-    def test_template_overrides(self):
-        __current_test_mode_setting = settings.CAPTCHA_IMAGE_TEMPLATE
-        __current_field_template = settings.CAPTCHA_FIELD_TEMPLATE
-        settings.CAPTCHA_IMAGE_TEMPLATE = "captcha_test/image.html"
-        settings.CAPTCHA_FIELD_TEMPLATE = "captcha/field.html"
-
-        for urlname in ("captcha-test", "captcha-test-model-form"):
-            settings.CAPTCHA_CHALLENGE_FUNCT = "captcha.tests.trivial_challenge"
-            r = self.client.get(reverse(urlname))
-            self.assertTrue("captcha-template-test" in str(r.content))
-        settings.CAPTCHA_IMAGE_TEMPLATE = __current_test_mode_setting
-        settings.CAPTCHA_FIELD_TEMPLATE = __current_field_template
-
     def test_math_challenge(self):
         __current_test_mode_setting = settings.CAPTCHA_MATH_CHALLENGE_OPERATOR
         settings.CAPTCHA_MATH_CHALLENGE_OPERATOR = "~"
diff --git a/docs/advanced.rst b/docs/advanced.rst
index a7d9fdcf..8af41ede 100644
--- a/docs/advanced.rst
+++ b/docs/advanced.rst
@@ -148,21 +148,6 @@ Defaults to: 99
 
 Note: it's perfectly safe to specify e.g. ``CAPTCHA_DICTIONARY_MIN_LENGTH = CAPTCHA_DICTIONARY_MAX_LENGTH = 6`` but it's considered an error to define ``CAPTCHA_DICTIONARY_MAX_LENGTH`` to be smaller than ``CAPTCHA_DICTIONARY_MIN_LENGTH``.
 
-.. _output_format_ref:
-
-CAPTCHA_OUTPUT_FORMAT
-------------------------
-
-New in version 0.1.6
-
-Specify your own output format for the generated markup, when e.g. you want to position the captcha image relative to the text field in your form.
-
-Defaults to: ``None``
-
-(Used to default to: ``u'%(image)s %(hidden_field)s %(text_field)s'``)
-
-.. warning:: This setting is deprecated in favor of template-based widget rendering (see the Rendering section below).
-
 
 CAPTCHA_TEST_MODE
 ------------------------
@@ -239,38 +224,12 @@ And then have a ``custom_field.html`` template::
 
 .. note:: For this to work, you MUST
    add ``django.forms`` to your ``INSTALLED_APPS`` and
-   set ``FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'`` to your settings.py.
+   set ``FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'`` in your settings.py.
    (See here_ for an explanation)
 
 .. _here: https://docs.djangoproject.com/en/2.0/ref/forms/renderers/#django.forms.renderers.TemplatesSetting
 
-.. warning:: To provide backwards compatibility, the old style rendering has priority over the widget templates.
-   If the ``CAPTCHA_FIELD_TEMPLATE`` or ``CAPTCHA_OUTPUT_FORMAT`` settings or ``field_templates`` or ``output_format`` parameter are set, the direct rendering gets higher priority.
-   If widget templates are ignored, make sure you're using Django >= 1.11 and disable these settings and parameters.
-
-
-
-Old style rendering
--------------------
-
-.. warning:: This rendering method is deprecated. Use Django >= 1.11 and widgets templates instead.
-
-A CAPTCHA field is made up of three components:
-
-* The actual image that the end user has to copy from
-* A text field, that the user has to fill with the content of the image
-* A hidden field, containing the database reference of the CAPTCHA (for verification).
-
-These three elements are rendered individually, then assembled into a single bit of HTML.
-
-As of version 0.4.7 you can control how the individual components are rendered, as well as how all components are assembled, by overriding four templates:
-
-* ``captcha/image.html`` controls the rendering of the image (and optionally audio) element
-* ``captcha/text_field.html`` controls the rendering of the text field
-* ``captcha/hidden_field.html`` controls the rendering of the hidden input
-* ``captcha/field.html`` controls the assembling of the previous three elements
 
-These templates can be overridden in your own ``templates`` folder, or you can change the actual template names by settings ``CAPTCHA_IMAGE_TEMPLATE``, ``CAPTCHA_TEXT_FIELD_TEMPLATE``, ``CAPTCHA_HIDDEN_FIELD_TEMPLATE`` and ``CAPTCHA_FIELD_TEMPLATE``, respectively.
 
 Context
 ~~~~~~~
diff --git a/docs/conf.py b/docs/conf.py
index 9f7cba67..bb690f58 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,14 +42,14 @@
 
 # General information about the project.
 project = "Django Simple Captcha"
-copyright = "2011-2021 Marco Bonetti and contributors"
+copyright = "2011-2023 Marco Bonetti and contributors"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "0.5.18"
+version = "0.6.0"
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/testproject/forms.py b/testproject/forms.py
index 1a471753..248f2a5c 100644
--- a/testproject/forms.py
+++ b/testproject/forms.py
@@ -1,7 +1,15 @@
 from django import forms
 
-from captcha.fields import CaptchaField
+from captcha.fields import CaptchaField, CaptchaTextInput
+
+
+class CustomCaptchaTextInput(CaptchaTextInput):
+    template_name = "captcha_test/custom_captcha_field.html"
 
 
 class CaptchaForm(forms.Form):
     captcha = CaptchaField()
+
+
+class CustomCaptchaForm(forms.Form):
+    captcha = CaptchaField(widget=CustomCaptchaTextInput)
diff --git a/testproject/settings.py b/testproject/settings.py
index 4de2a3c6..a743f9a0 100644
--- a/testproject/settings.py
+++ b/testproject/settings.py
@@ -27,9 +27,11 @@
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.sites",
+    "django.forms",
     "django.contrib.messages",
     "captcha",
 ]
+FORM_RENDERER = "django.forms.renderers.TemplatesSetting"
 
 LANGUAGE_CODE = "en"
 
@@ -78,4 +80,3 @@
 CAPTCHA_SOX_PATH = os.environ.get("CAPTCHA_SOX_PATH", None)
 CAPTCHA_BACKGROUND_COLOR = "transparent"
 # CAPTCHA_BACKGROUND_COLOR = '#ffffffff'
-CAPTCHA_IMAGE_TEMPLATE = "captcha_test/image_html5_audio.html"
diff --git a/testproject/templates/captcha_test/custom_captcha_field.html b/testproject/templates/captcha_test/custom_captcha_field.html
new file mode 100644
index 00000000..87b01c9f
--- /dev/null
+++ b/testproject/templates/captcha_test/custom_captcha_field.html
@@ -0,0 +1,17 @@
+{% load i18n %}
+{% spaceless %}
+<div class="form-group">
+  <label class="control-label">{{ label }}</label>
+  <div class="form-group">
+    <div class="input-group mb-3">
+      <div class="input-group-prepend">
+        {% if audio %}
+            <a title="{% trans "Play CAPTCHA as audio file" %}" href="{{ audio }}">
+        {% endif %}
+        <img src="{{ image }}" alt="captcha" class="captcha" />
+      </div>
+      {% include "django/forms/widgets/multiwidget.html" %}
+    </div>
+  </div>
+</div>
+{% endspaceless %}
diff --git a/testproject/templates/captcha_test/image_html5_audio.html b/testproject/templates/captcha_test/image_html5_audio.html
index 32319bbd..2eaca90d 100644
--- a/testproject/templates/captcha_test/image_html5_audio.html
+++ b/testproject/templates/captcha_test/image_html5_audio.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 {% spaceless %}
-    <img src="{{image}}" alt="captcha-template-test" class="captcha" />
+    <img src="{{image}}" class="captcha" />
 
 {% if audio %}
     <a href="#" id="audio-button">play audio</a>
diff --git a/testproject/views.py b/testproject/views.py
index 6a9b5909..aeac6f50 100644
--- a/testproject/views.py
+++ b/testproject/views.py
@@ -1,4 +1,4 @@
-from forms import CaptchaForm
+from forms import CaptchaForm  # CustomCaptchaForm
 
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
diff --git a/tox.ini b/tox.ini
index d50a7a67..ceb814da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,17 @@
 
 [tox]
 envlist =
-        py{38,39,310}-django{32,40,41,42},
-        py{38,39,310}-django{32,40,41,42}-jinja2,
+        py{39,310,311}-django42,
+        py{310,311}-django50,
+        py{39,310}-django42-jinja2,
+        py{310,311}-django{42,50}-jinja2,
         gettext,flake8,docs
 
 [gh-actions]
 python =
-  3.10: py310-django32, py310-django32-jinja2, py310-django40, py310-django40-jinja2, py310-django41, py310-django41-jinja2, py310-django42, py310-django42-jinja2
-  3.9: py39-django32, py39-django32-jinja2, py39-django40, py39-django40-jinja2, py39-django41, py39-django41-jinja2, py39-django42, py39-django42-jinja2
-  3.8: py38-django32, py38-django32-jinja2, py38-django40, py38-django40-jinja2, py38-django41, py38-django41-jinja2, py38-django42, py38-django42-jinja2
+  3.11: p311-django-50, p311-django-50-jinjia, p311-django-42, p311-django-42-jinjia
+  3.10: py310-django42, py310-django42-jinja2, py310-django50, py310-django50-jinja2
+  3.9: py39-django42, py39-django42-jinja2
 
 [testenv]
 changedir = testproject
@@ -20,53 +22,25 @@ setenv =
         PYTHONDONTWRITEBYTECODE=1
 
 deps =
-        django32: Django>=3.2,<3.3
-        django40: Django>=4.0,<4.1
-        django41: Django>=4.1a,<4.2
         django42: Django>=4.2a,<4.3
-        py{38,39,310}-django{32,40,41,42}: python3-memcached
+        django50: Django>=5.0a,<5.1
+        py{39,310}-django{42,50}: python3-memcached
         jinja2
 
 extras =
         test
 
 
-[testenv:py38-django32-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-[testenv:py39-django32-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-[testenv:py310-django32-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-
-[testenv:py38-django40-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-[testenv:py39-django40-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-[testenv:py310-django40-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-[testenv:py38-django41-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-[testenv:py39-django41-jinja2]
-commands = python -Wd manage.py test captcha --settings jinja2_settings
-
-[testenv:py310-django41-jinja2]
+[testenv:py39-django42-jinja2]
 commands = python -Wd manage.py test captcha --settings jinja2_settings
 
-
-[testenv:py38-django42-jinja2]
+[testenv:py310-django42-jinja2]
 commands = python -Wd manage.py test captcha --settings jinja2_settings
 
-[testenv:py39-django42-jinja2]
+[testenv:py310-django50-jinja2]
 commands = python -Wd manage.py test captcha --settings jinja2_settings
 
-[testenv:py310-django42-jinja2]
+[testenv:py311-django50-jinja2]
 commands = python -Wd manage.py test captcha --settings jinja2_settings