Update djangorestframework requirement from ==3.16.* to ==3.17.* (#6013)

* Update djangorestframework requirement from ==3.16.* to ==3.17.*

Updates the requirements on [djangorestframework](https://github.com/encode/django-rest-framework) to permit the latest version.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.16.0...3.17.0)

---
updated-dependencies:
- dependency-name: djangorestframework
  dependency-version: 3.17.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix failing test

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Raphael Michel <michel@rami.io>

pyproject.toml

@@ -56,7 +56,7 @@ dependencies = [
   "django-redis==6.0.*",
   "django-scopes==2.0.*",
   "django-statici18n==2.7.*",
-  "djangorestframework==3.16.*",
+  "djangorestframework==3.17.*",
   "dnspython==2.8.*",
   "drf_ujson2==1.7.*",
   "geoip2==5.*",

src/pretix/base/forms/questions.py

@@ -35,7 +35,6 @@
 import copy
 import json
 import logging
-import re
 from datetime import timedelta
 from decimal import Decimal
 from io import BytesIO
@@ -48,7 +47,9 @@ from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.validators import MaxValueValidator, MinValueValidator
+from django.core.validators import (
+    MaxValueValidator, MinValueValidator, RegexValidator,
+)
 from django.db.models import QuerySet
 from django.forms import Select, widgets
 from django.forms.widgets import FILE_INPUT_CONTRADICTION
@@ -219,6 +220,20 @@ class NamePartsFormField(forms.MultiValueField):
         defaults = {
             'widget': self.widget,
             'max_length': kwargs.pop('max_length', None),
+            'validators': [
+                RegexValidator(
+                    # The following characters should never appear in a name anywhere of
+                    # the world. However, they commonly appear in inputs generated by spam
+                    # bots.
+                    r'^[^$€/%§{}<>~]*$',
+                    message=_('Please do not use special characters in names.')
+                ),
+                RegexValidator(
+                    URL_RE,
+                    inverse_match=True,
+                    message=_('Please do not use special characters in names.')
+                )
+            ]
         }
         self.max_length = defaults['max_length']
         self.scheme_name = kwargs.pop('scheme')
@@ -240,6 +255,7 @@ class NamePartsFormField(forms.MultiValueField):
             if fname == 'title' and self.scheme_titles:
                 d = dict(defaults)
                 d.pop('max_length', None)
+                d.pop('validators', None)
                 field = forms.ChoiceField(
                     **d,
                     choices=[('', '')] + [(d, d) for d in self.scheme_titles[1]]
@@ -248,6 +264,7 @@ class NamePartsFormField(forms.MultiValueField):
             elif fname == 'salutation':
                 d = dict(defaults)
                 d.pop('max_length', None)
+                d.pop('validators', None)
                 field = forms.ChoiceField(
                     **d,
                     choices=[
@@ -279,36 +296,6 @@ class NamePartsFormField(forms.MultiValueField):
         if sum(len(v) for v in value.values() if v) > (self.max_length or 250):
             raise forms.ValidationError(_('Please enter a shorter name.'), code='max_length')
 
-        for fname, label, size in self.scheme['fields']:
-            if fname == 'salutation' or (fname == 'title' and self.scheme_titles):
-                continue
-            v = value.get(fname)
-            if not v:
-                continue
-            special_chars = re.findall('[$€/%§{}<>~]', v)
-            if special_chars:
-                raise forms.ValidationError(
-                    _('The field "%(label)s" may not contain special characters such as "%(chars)s".'),
-                    code='name_special_chars',
-                    params={
-                        "label": label,
-                        "chars": "".join(special_chars),
-                    },
-                )
-            # URL_RE checks for valid domain names, including one special TLD med, which can be part of a title
-            # correct spelling for URL-matching, but keep original spelling in user-provided value
-            v = v.replace(".med", ". med")
-            url_matched = URL_RE.match(v)
-            if url_matched:
-                raise forms.ValidationError(
-                    _('The field "%(label)s" may not contain an URL (%(url)s).'),
-                    code='url_in_title',
-                    params={
-                        "label": label,
-                        "url": url_matched.group(0),
-                    }
-                )
-
         if value.get("salutation") == "empty":
             value["salutation"] = ""
 

src/pretix/presale/signals.py

@@ -126,7 +126,7 @@ footer_link = EventPluginSignal()
 Arguments: ``request``
 
 The signal ``pretix.presale.signals.footer_link`` allows you to add links to the footer of an event page. You
-are expected to return a dictionary containing the keys ``label`` and ``url``.
+are expected to return a dictionary containing the keys ``label``, ``url`` and optionally ``cssclass``.
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 """

src/pretix/presale/templates/pretixpresale/base.html

@@ -80,7 +80,7 @@
                 <li>{{ footer_text }}</li>
             {% endif %}
             {% for f in footer %}
-                <li><a href="{% safelink f.url %}" target="_blank" rel="noopener">{{ f.label }}</a></li>
+                <li><a class="{{ f.cssclass }}" href="{% safelink f.url %}" target="_blank" rel="noopener">{{ f.label }}</a></li>
             {% endfor %}
             {% include "pretixpresale/base_footer.html" %} {# removing or hiding this might be in violation of pretix' license #}
             </ul>

src/pretix/static/pretixpresale/scss/main.scss

@@ -201,13 +201,16 @@ footer nav li:not(:first-child):before {
     width: 1.5em;
     text-align: center;
 }
+footer nav .btn, 
 footer nav .btn-link {
     display: inline;
-    padding: 0;
     margin: 0;
     font-size: 11px;
     vertical-align: baseline;
 }
+footer nav .btn-link {
+    padding: 0;
+}
 
 .js-only {
     display: none;

src/tests/plugins/autocheckin/test_api.py

@@ -43,7 +43,7 @@ RES_RULE = {
     "limit_products": [],
     "limit_variations": [],
     "all_payment_methods": True,
-    "limit_payment_methods": set(),
+    "limit_payment_methods": [],
 }