Fix Pillow version

src/pretix/api/auth/devicesecurity.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FullAccessSecurityProfile:

src/pretix/api/signals.py

@@ -8,9 +8,7 @@ from pretix.api.models import ApiCall, WebHookCall
 from pretix.base.signals import periodic_task
 from pretix.helpers.periodic import minimum_interval
 
-register_webhook_events = Signal(
-    providing_args=[]
-)
+register_webhook_events = Signal()
 """
 This signal is sent out to get all known webhook events. Receivers should return an
 instance of a subclass of pretix.api.webhooks.WebhookEvent or a list of such

src/pretix/api/urls.py

@@ -1,7 +1,7 @@
 import importlib
 
 from django.apps import apps
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from rest_framework import routers
 
 from pretix.api.views import cart
@@ -72,30 +72,32 @@ for app in apps.get_app_configs():
             importlib.import_module(app.name + '.urls')
 
 urlpatterns = [
-    url(r'^', include(router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
-        name="organizer.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
-        name="event.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/', include(item_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
-        include(question_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/checkinlists/(?P<list>[^/]+)/',
-        include(checkinlist_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/orders/(?P<order>[^/]+)/', include(order_router.urls)),
-    url(r"^oauth/authorize$", oauth.AuthorizationView.as_view(), name="authorize"),
-    url(r"^oauth/token$", oauth.TokenView.as_view(), name="token"),
-    url(r"^oauth/revoke_token$", oauth.RevokeTokenView.as_view(), name="revoke-token"),
-    url(r"^device/initialize$", device.InitializeView.as_view(), name="device.initialize"),
-    url(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
-    url(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
-    url(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
-    url(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
-    url(r"^upload$", upload.UploadView.as_view(), name="upload"),
-    url(r"^me$", user.MeView.as_view(), name="user.me"),
-    url(r"^version$", version.VersionView.as_view(), name="version"),
+    re_path(r'^', include(router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
+            name="organizer.settings"),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
+            name="event.settings"),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/',
+            include(item_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
+            include(question_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/checkinlists/(?P<list>[^/]+)/',
+            include(checkinlist_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/orders/(?P<order>[^/]+)/',
+            include(order_router.urls)),
+    re_path(r"^oauth/authorize$", oauth.AuthorizationView.as_view(), name="authorize"),
+    re_path(r"^oauth/token$", oauth.TokenView.as_view(), name="token"),
+    re_path(r"^oauth/revoke_token$", oauth.RevokeTokenView.as_view(), name="revoke-token"),
+    re_path(r"^device/initialize$", device.InitializeView.as_view(), name="device.initialize"),
+    re_path(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
+    re_path(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
+    re_path(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
+    re_path(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
+    re_path(r"^upload$", upload.UploadView.as_view(), name="upload"),
+    re_path(r"^me$", user.MeView.as_view(), name="user.me"),
+    re_path(r"^version$", version.VersionView.as_view(), name="version"),
 ]

src/pretix/base/migrations/0102_auto_20181017_0024.py

@@ -1,6 +1,6 @@
 # Generated by Django 2.1 on 2018-10-17 00:24
 
-import jsonfallback.fields
+
 from django.core.exceptions import ImproperlyConfigured
 from django.db import migrations
 from django_mysql.checks import mysql_connections
@@ -77,19 +77,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(null=False, default=dict),
+            field=models.JSONField(null=False, default=dict),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(null=False, default=dict),
+            field=models.JSONField(null=False, default=dict),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
             preserve_default=False,
         ),
         migrations.RunPython(set_attendee_name_parts, migrations.RunPython.noop)

src/pretix/base/migrations/0103_auto_20181121_1224.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.1 on 2018-11-21 12:24
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0104_auto_20181114_1526.py

@@ -2,7 +2,6 @@
 
 import django.db.models.deletion
 import django.db.models.manager
-import jsonfallback.fields
 from django.db import migrations, models
 
 

src/pretix/base/migrations/0105_auto_20190112_1512.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1 on 2019-01-12 15:12
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0107_auto_20190129_1337.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-01-29 13:37
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0108_auto_20190201_1527.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-01 15:27
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0108_auto_20190201_1527_squashed_0141_seat_sorting_rank.py

@@ -3,7 +3,6 @@
 from decimal import Decimal
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.conf import settings
 from django.core.cache import cache
 from django.db import migrations, models
@@ -190,7 +189,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='cartposition',
@@ -210,7 +209,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='item',
@@ -225,7 +224,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='orderposition',

src/pretix/base/migrations/0109_auto_20190208_1432.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1 on 2019-02-08 14:32
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0110_auto_20190219_1245.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-19 12:45
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0111_auto_20190219_0949.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-19 09:49
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0113_auto_20190312_0942.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-03-12 09:42
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0114_auto_20190316_1014.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.7 on 2019-03-16 10:14
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0115_auto_20190323_2238.py

@@ -3,7 +3,6 @@
 from decimal import Decimal
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0116_auto_20190402_0722.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-04-02 07:22
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0118_auto_20190423_0839.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-04-23 08:39
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0119_auto_20190509_0654.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-05-09 06:54
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0120_auto_20190509_0736.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-05-09 07:36
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields
@@ -17,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='cartposition',
@@ -37,7 +36,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='item',
@@ -52,7 +51,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='orderposition',

src/pretix/base/migrations/0152_auto_20200511_1504.py

@@ -2,7 +2,6 @@
 
 import django.db.models.deletion
 import django_countries.fields
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.helpers.countries
@@ -43,7 +42,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='checkinlist',
             name='rules',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterUniqueTogether(
             name='checkin',

src/pretix/base/migrations/0177_auto_20210301_1510.py

@@ -1,6 +1,6 @@
 # Generated by Django 3.0.10 on 2021-03-01 15:10
 
-import jsonfallback.fields
+
 import phonenumber_field.modelfields
 from django.db import migrations, models
 
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='waitinglistentry',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AddField(
             model_name='waitinglistentry',

src/pretix/base/models/checkin.py

@@ -4,7 +4,6 @@ from django.db.models import Exists, F, Max, OuterRef, Q, Subquery
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
-from jsonfallback.fields import FallbackJSONField
 
 from pretix.base.models import LoggedModel
 from pretix.base.models.fields import MultiStringField
@@ -47,7 +46,7 @@ class CheckinList(LoggedModel):
                     'any of the selected sales channels. This option can be useful when tickets sold at the box office '
                     'are not checked again before entry and should be considered validated directly upon purchase.')
     )
-    rules = FallbackJSONField(default=dict, blank=True)
+    rules = models.JSONField(default=dict, blank=True)
 
     objects = ScopedManager(organizer='event__organizer')
 

src/pretix/base/models/orders.py

@@ -29,7 +29,6 @@ from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country
 from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.strings import LazyI18nString
-from jsonfallback.fields import FallbackJSONField
 from phonenumber_field.modelfields import PhoneNumberField
 from phonenumber_field.phonenumber import PhoneNumber
 from phonenumbers import NumberParseException
@@ -1132,7 +1131,7 @@ class AbstractPosition(models.Model):
         blank=True, null=True,
         help_text=_("Empty, if this product is not an admission ticket")
     )
-    attendee_name_parts = FallbackJSONField(
+    attendee_name_parts = models.JSONField(
         blank=True, default=dict
     )
     attendee_email = models.EmailField(
@@ -2252,7 +2251,7 @@ class InvoiceAddress(models.Model):
     is_business = models.BooleanField(default=False, verbose_name=_('Business customer'))
     company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'))
     name_cached = models.CharField(max_length=255, verbose_name=_('Full name'), blank=True)
-    name_parts = FallbackJSONField(default=dict)
+    name_parts = models.JSONField(default=dict)
     street = models.TextField(verbose_name=_('Address'), blank=False)
     zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=False)
     city = models.CharField(max_length=255, verbose_name=_('City'), blank=False)

src/pretix/base/models/waitinglist.py

@@ -5,7 +5,6 @@ from django.db import models, transaction
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
-from jsonfallback.fields import FallbackJSONField
 from phonenumber_field.modelfields import PhoneNumberField
 
 from pretix.base.email import get_email_context
@@ -45,7 +44,7 @@ class WaitingListEntry(LoggedModel):
         verbose_name=_("Name"),
         blank=True, null=True,
     )
-    name_parts = FallbackJSONField(
+    name_parts = models.JSONField(
         blank=True, default=dict
     )
     email = models.EmailField(

src/pretix/base/signals.py

@@ -164,9 +164,7 @@ class DeprecatedSignal(django.dispatch.Signal):
         super().connect(receiver, sender=None, weak=True, dispatch_uid=None)
 
 
-event_live_issues = EventPluginSignal(
-    providing_args=[]
-)
+event_live_issues = EventPluginSignal()
 """
 This signal is sent out to determine whether an event can be taken live. If you want to
 prevent the event from going live, return a string that will be displayed to the user
@@ -176,9 +174,7 @@ As with all event-plugin signals, the ``sender`` keyword argument will contain t
 """
 
 
-register_payment_providers = EventPluginSignal(
-    providing_args=[]
-)
+register_payment_providers = EventPluginSignal()
 """
 This signal is sent out to get all known payment providers. Receivers should return a
 subclass of pretix.base.payment.BasePaymentProvider or a list of these
@@ -186,9 +182,7 @@ subclass of pretix.base.payment.BasePaymentProvider or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_mail_placeholders = EventPluginSignal(
-    providing_args=[]
-)
+register_mail_placeholders = EventPluginSignal()
 """
 This signal is sent out to get all known email text placeholders. Receivers should return
 an instance of a subclass of pretix.base.email.BaseMailTextPlaceholder or a list of these.
@@ -196,9 +190,7 @@ an instance of a subclass of pretix.base.email.BaseMailTextPlaceholder or a list
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_html_mail_renderers = EventPluginSignal(
-    providing_args=[]
-)
+register_html_mail_renderers = EventPluginSignal()
 """
 This signal is sent out to get all known HTML email renderers. Receivers should return a
 subclass of pretix.base.email.BaseHTMLMailRenderer or a list of these
@@ -206,9 +198,7 @@ subclass of pretix.base.email.BaseHTMLMailRenderer or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_invoice_renderers = EventPluginSignal(
-    providing_args=[]
-)
+register_invoice_renderers = EventPluginSignal()
 """
 This signal is sent out to get all known invoice renderers. Receivers should return a
 subclass of pretix.base.invoice.BaseInvoiceRenderer or a list of these
@@ -216,9 +206,7 @@ subclass of pretix.base.invoice.BaseInvoiceRenderer or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_ticket_secret_generators = EventPluginSignal(
-    providing_args=[]
-)
+register_ticket_secret_generators = EventPluginSignal()
 """
 This signal is sent out to get all known ticket secret generators. Receivers should return a
 subclass of ``pretix.base.secrets.BaseTicketSecretGenerator`` or a list of these
@@ -226,9 +214,7 @@ subclass of ``pretix.base.secrets.BaseTicketSecretGenerator`` or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_data_shredders = EventPluginSignal(
-    providing_args=[]
-)
+register_data_shredders = EventPluginSignal()
 """
 This signal is sent out to get all known data shredders. Receivers should return a
 subclass of pretix.base.shredder.BaseDataShredder or a list of these
@@ -236,9 +222,7 @@ subclass of pretix.base.shredder.BaseDataShredder or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_ticket_outputs = EventPluginSignal(
-    providing_args=[]
-)
+register_ticket_outputs = EventPluginSignal()
 """
 This signal is sent out to get all known ticket outputs. Receivers should return a
 subclass of pretix.base.ticketoutput.BaseTicketOutput
@@ -246,9 +230,7 @@ subclass of pretix.base.ticketoutput.BaseTicketOutput
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_notification_types = EventPluginSignal(
-    providing_args=[]
-)
+register_notification_types = EventPluginSignal()
 """
 This signal is sent out to get all known notification types. Receivers should return an
 instance of a subclass of pretix.base.notifications.NotificationType or a list of such
@@ -259,18 +241,14 @@ however for this signal, the ``sender`` **may also be None** to allow creating t
 notification settings!
 """
 
-register_sales_channels = django.dispatch.Signal(
-    providing_args=[]
-)
+register_sales_channels = django.dispatch.Signal()
 """
 This signal is sent out to get all known sales channels types. Receivers should return an
 instance of a subclass of ``pretix.base.channels.SalesChannel`` or a list of such
 instances.
 """
 
-register_data_exporters = EventPluginSignal(
-    providing_args=[]
-)
+register_data_exporters = EventPluginSignal()
 """
 This signal is sent out to get all known data exporters. Receivers should return a
 subclass of pretix.base.exporter.BaseExporter
@@ -278,21 +256,20 @@ subclass of pretix.base.exporter.BaseExporter
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_multievent_data_exporters = django.dispatch.Signal(
-    providing_args=["event"]
-)
+register_multievent_data_exporters = django.dispatch.Signal()
 """
+Arguments: ``event``
+
 This signal is sent out to get all known data exporters, which support exporting data for
 multiple events. Receivers should return a subclass of pretix.base.exporter.BaseExporter
 
 The ``sender`` keyword argument will contain an organizer.
 """
 
-validate_order = EventPluginSignal(
-    providing_args=["payment_provider", "positions", "email", "locale", "invoice_address",
-                    "meta_info"]
-)
+validate_order = EventPluginSignal()
 """
+Arguments: ``payment_provider``, ``positions``, ``email``, ``locale``, ``invoice_address``, ``meta_info``
+
 This signal is sent out when the user tries to confirm the order, before we actually create
 the order. It allows you to inspect the cart positions. Your return value will be ignored,
 but you can raise an OrderError with an appropriate exception message if you like to block
@@ -301,10 +278,10 @@ the order. We strongly discourage making changes to the order here.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_cart = EventPluginSignal(
-    providing_args=["positions"]
-)
+validate_cart = EventPluginSignal()
 """
+Arguments: ``positions``
+
 This signal is sent out before the user starts checkout. It includes an iterable
 with the current CartPosition objects.
 The response of receivers will be ignored, but you can raise a CartError with an
@@ -313,10 +290,10 @@ appropriate exception message.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_cart_addons = EventPluginSignal(
-    providing_args=["addons", "base_position", "iao"]
-)
+validate_cart_addons = EventPluginSignal()
 """
+Arguments: ``addons``, ``base_position``, ``iao``
+
 This signal is sent when a user tries to select a combination of addons. In contrast to
  ``validate_cart``, this is executed before the cart is actually modified. You are passed
 an argument ``addons`` containing a dict of ``(item, variation or None) → count`` tuples as well
@@ -328,10 +305,10 @@ appropriate exception message.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_placed = EventPluginSignal(
-    providing_args=["order"]
-)
+order_placed = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is placed. The order object is given
 as the first argument. This signal is *not* sent out if an order is created through
 splitting an existing order, so you can not expect to see all orders by listening
@@ -340,10 +317,10 @@ to this signal.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_paid = EventPluginSignal(
-    providing_args=["order"]
-)
+order_paid = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is paid. The order object is given
 as the first argument. This signal is *not* sent out if an order is marked as paid
 because an already-paid order has been split.
@@ -351,80 +328,80 @@ because an already-paid order has been split.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_canceled = EventPluginSignal(
-    providing_args=["order"]
-)
+order_canceled = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is canceled. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_reactivated = EventPluginSignal(
-    providing_args=["order"]
-)
+order_reactivated = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time a canceled order is reactivated. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_expired = EventPluginSignal(
-    providing_args=["order"]
-)
+order_expired = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is marked as expired. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_modified = EventPluginSignal(
-    providing_args=["order"]
-)
+order_modified = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order's information is modified. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_changed = EventPluginSignal(
-    providing_args=["order"]
-)
+order_changed = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order's content is changed. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_approved = EventPluginSignal(
-    providing_args=["order"]
-)
+order_approved = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is being approved. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_denied = EventPluginSignal(
-    providing_args=["order"]
-)
+order_denied = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is being denied. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_gracefully_delete = EventPluginSignal(
-    providing_args=["order"]
-)
+order_gracefully_delete = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time a test-mode order is being deleted. The order object
 is given as the first argument.
 
@@ -435,10 +412,10 @@ the deletion of the order.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-checkin_created = EventPluginSignal(
-    providing_args=["checkin"],
-)
+checkin_created = EventPluginSignal()
 """
+Arguments: ``checkin``
+
 This signal is sent out every time a check-in is created (i.e. an order position is marked as
 checked in). It is not send if the position was already checked in and is force-checked-in a second time.
 The check-in object is given as the first argument
@@ -446,10 +423,10 @@ The check-in object is given as the first argument
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-logentry_display = EventPluginSignal(
-    providing_args=["logentry"]
-)
+logentry_display = EventPluginSignal()
 """
+Arguments: ``logentry``
+
 To display an instance of the ``LogEntry`` model to a human user,
 ``pretix.base.signals.logentry_display`` will be sent out with a ``logentry`` argument.
 
@@ -459,10 +436,10 @@ to the user. The receivers are expected to return plain text.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-logentry_object_link = EventPluginSignal(
-    providing_args=["logentry"]
-)
+logentry_object_link = EventPluginSignal()
 """
+Arguments: ``logentry``
+
 To display the relationship of an instance of the ``LogEntry`` model to another model
 to a human user, ``pretix.base.signals.logentry_object_link`` will be sent out with a
 ``logentry`` argument.
@@ -487,10 +464,10 @@ Make sure that any user content in the HTML code you return is properly escaped!
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-requiredaction_display = EventPluginSignal(
-    providing_args=["action", "request"]
-)
+requiredaction_display = EventPluginSignal()
 """
+Arguments: ``action``, ``request``
+
 To display an instance of the ``RequiredAction`` model to a human user,
 ``pretix.base.signals.requiredaction_display`` will be sent out with a ``action`` argument.
 You will also get the current ``request`` in a different argument.
@@ -501,10 +478,10 @@ to the user. The receivers are expected to return HTML code.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-event_copy_data = EventPluginSignal(
-    providing_args=["other", "tax_map", "category_map", "item_map", "question_map", "variation_map", "checkin_list_map"]
-)
+event_copy_data = EventPluginSignal()
 """
+Arguments: "other", ``tax_map``, ``category_map``, ``item_map``, ``question_map``, ``variation_map``, ``checkin_list_map``
+
 This signal is sent out when a new event is created as a clone of an existing event, i.e.
 the settings from the older event are copied to the newer one. You can listen to this
 signal to copy data or configuration stored within your plugin's models as well.
@@ -519,10 +496,10 @@ keyword argument will contain the event to **copy from**. The keyword arguments
 in the new event of the respective types.
 """
 
-item_copy_data = EventPluginSignal(
-    providing_args=["source", "target"]
-)
+item_copy_data = EventPluginSignal()
 """
+Arguments: ``source``, ``target``
+
 This signal is sent out when a new product is created as a clone of an existing product, i.e.
 the settings from the older product are copied to the newer one. You can listen to this
 signal to copy data or configuration stored within your plugin's models as well.
@@ -546,10 +523,10 @@ All plugins that are installed may send fields for the global settings form, as
 an OrderedDict of (setting name, form field).
 """
 
-order_fee_calculation = EventPluginSignal(
-    providing_args=['positions', 'invoice_address', 'meta_info', 'total', 'gift_cards']
-)
+order_fee_calculation = EventPluginSignal()
 """
+Arguments: 'positions', 'invoice_address', 'meta_info', 'total', 'gift_cards'
+
 This signals allows you to add fees to an order while it is being created. You are expected to
 return a list of ``OrderFee`` objects that are not yet saved to the database
 (because there is no order yet).
@@ -562,10 +539,10 @@ keyword argument will contain the total cart sum without any fees. You should no
 the gift cards in use.
 """
 
-order_fee_type_name = EventPluginSignal(
-    providing_args=['request', 'fee']
-)
+order_fee_type_name = EventPluginSignal()
 """
+Arguments: 'request', 'fee'
+
 This signals allows you to return a human-readable description for a fee type based on the ``fee_type``
 and ``internal_type`` attributes of the ``OrderFee`` model that you get as keyword arguments. You are
 expected to return a string or None, if you don't know about this fee.
@@ -573,20 +550,20 @@ expected to return a string or None, if you don't know about this fee.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-allow_ticket_download = EventPluginSignal(
-    providing_args=['order']
-)
+allow_ticket_download = EventPluginSignal()
 """
+Arguments: 'order'
+
 This signal is sent out to check if tickets for an order can be downloaded. If any receiver returns false,
 a download will not be offered.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-email_filter = EventPluginSignal(
-    providing_args=['message', 'order', 'user']
-)
+email_filter = EventPluginSignal()
 """
+Arguments: 'message', 'order', 'user'
+
 This signal allows you to implement a middleware-style filter on all outgoing emails. You are expected to
 return a (possibly modified) copy of the message object passed to you.
 
@@ -598,10 +575,10 @@ If the email is associated with a specific user, e.g. a notification email, the
 well, otherwise it will be ``None``.
 """
 
-global_email_filter = GlobalSignal(
-    providing_args=['message', 'order', 'user']
-)
+global_email_filter = GlobalSignal()
 """
+Arguments: 'message', 'order', 'user'
+
 This signal allows you to implement a middleware-style filter on all outgoing emails. You are expected to
 return a (possibly modified) copy of the message object passed to you.
 
@@ -666,10 +643,10 @@ a ``subevent`` argument which might be none and you are expected to return a lis
 """
 
 
-quota_availability = EventPluginSignal(
-    providing_args=['quota', 'result', 'count_waitinglist']
-)
+quota_availability = EventPluginSignal()
 """
+Arguments: 'quota', 'result', 'count_waitinglist'
+
 This signal allows you to modify the availability of a quota. You are passed the ``quota`` and an
 ``availability`` result calculated by pretix code or other plugins. ``availability`` is a tuple
 with the first entry being one of the ``Quota.AVAILABILITY_*`` constants and the second entry being
@@ -682,25 +659,23 @@ system really bad.** Also, keep in mind that your response is subject to caching
 quotas might be used for display (not for actual order processing).
 """
 
-order_split = EventPluginSignal(
-    providing_args=["original", "split_order"]
-)
+order_split = EventPluginSignal()
 """
+Arguments: ``original``, ``split_order``
+
 This signal is sent out when an order is split into two orders and allows you to copy related models
 to the new order. You will be passed the old order as ``original`` and the new order as ``split_order``.
 """
 
-invoice_line_text = EventPluginSignal(
-    providing_args=["position"]
-)
+invoice_line_text = EventPluginSignal()
 """
+Arguments: ``position``
+
 This signal is sent out when an invoice is built for an order. You can return additional text that
 should be shown on the invoice for the given ``position``.
 """
 
-order_import_columns = EventPluginSignal(
-    providing_args=[]
-)
+order_import_columns = EventPluginSignal()
 """
 This signal is sent out if the user performs an import of orders from an external source. You can use this
 to define additional columns that can be read during import. You are expected to return a list of instances of
@@ -709,10 +684,10 @@ to define additional columns that can be read during import. You are expected to
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_event_settings = EventPluginSignal(
-    providing_args=["settings_dict"]
-)
+validate_event_settings = EventPluginSignal()
 """
+Arguments: ``settings_dict``
+
 This signal is sent out if the user performs an update of event settings through the API or web interface.
 You are passed a ``settings_dict`` dictionary with the new state of the event settings object and are expected
 to raise a ``django.core.exceptions.ValidationError`` if the new state is not valid.
@@ -723,9 +698,7 @@ serializer field instead.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-api_event_settings_fields = EventPluginSignal(
-    providing_args=[]
-)
+api_event_settings_fields = EventPluginSignal()
 """
 This signal is sent out to collect serializable settings fields for the API. You are expected to
 return a dictionary mapping names of attributes in the settings store to DRF serializer field instances.

src/pretix/base/templatetags/rich_text.py

@@ -153,9 +153,9 @@ def markdown_compile_email(source):
 
 class SnippetExtension(markdown.extensions.Extension):
     def extendMarkdown(self, md, *args, **kwargs):
-        del md.parser.blockprocessors['olist']
-        del md.parser.blockprocessors['ulist']
-        del md.parser.blockprocessors['quote']
+        md.parser.blockprocessors.deregister('olist')
+        md.parser.blockprocessors.deregister('ulist')
+        md.parser.blockprocessors.deregister('quote')
 
 
 def markdown_compile(source, snippet=False):

src/pretix/control/signals.py

@@ -2,9 +2,7 @@ from django.dispatch import Signal
 
 from pretix.base.signals import DeprecatedSignal, EventPluginSignal
 
-html_page_start = Signal(
-    providing_args=[]
-)
+html_page_start = Signal()
 """
 This signal allows you to put code in the beginning of the main page for every
 page in the backend. You are expected to return HTML.
@@ -12,10 +10,10 @@ page in the backend. You are expected to return HTML.
 The ``sender`` keyword argument will contain the request.
 """
 
-html_head = EventPluginSignal(
-    providing_args=["request"]
-)
+html_head = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal allows you to put code inside the HTML ``<head>`` tag
 of every page in the backend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -23,10 +21,10 @@ of every page in the backend. You will get the request as the keyword argument
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-nav_event = EventPluginSignal(
-    providing_args=["request"]
-)
+nav_event = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal allows you to add additional views to the admin panel
 navigation. You will get the request as a keyword argument ``request``.
 Receivers are expected to return a list of dictionaries. The dictionaries
@@ -48,10 +46,10 @@ in pretix.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-nav_topbar = Signal(
-    providing_args=["request"]
-)
+nav_topbar = Signal()
 """
+Arguments: ``request``
+
 This signal allows you to add additional views to the top navigation bar.
 You will get the request as a keyword argument ``request``.
 Receivers are expected to return a list of dictionaries. The dictionaries
@@ -67,10 +65,10 @@ This is no ``EventPluginSignal``, so you do not get the event in the ``sender``
 and you may get the signal regardless of whether your plugin is active.
 """
 
-nav_global = Signal(
-    providing_args=["request"]
-)
+nav_global = Signal()
 """
+Arguments: ``request``
+
 This signal allows you to add additional views to the navigation bar when no event is
 selected. You will get the request as a keyword argument ``request``.
 Receivers are expected to return a list of dictionaries. The dictionaries
@@ -92,10 +90,10 @@ This is no ``EventPluginSignal``, so you do not get the event in the ``sender``
 and you may get the signal regardless of whether your plugin is active.
 """
 
-event_dashboard_top = EventPluginSignal(
-    providing_args=['request']
-)
+event_dashboard_top = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal is sent out to include custom HTML in the top part of the the event dashboard.
 Receivers should return HTML.
 
@@ -103,9 +101,7 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 An additional keyword argument ``subevent`` *can* contain a sub-event.
 """
 
-event_dashboard_widgets = EventPluginSignal(
-    providing_args=[]
-)
+event_dashboard_widgets = EventPluginSignal()
 """
 This signal is sent out to include widgets in the event dashboard. Receivers
 should return a list of dictionaries, where each dictionary can have the keys:
@@ -120,10 +116,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 An additional keyword argument ``subevent`` *can* contain a sub-event.
 """
 
-user_dashboard_widgets = Signal(
-    providing_args=['user']
-)
+user_dashboard_widgets = Signal()
 """
+Arguments: 'user'
+
 This signal is sent out to include widgets in the personal user dashboard. Receivers
 should return a list of dictionaries, where each dictionary can have the keys:
 
@@ -136,20 +132,20 @@ should return a list of dictionaries, where each dictionary can have the keys:
 This is a regular django signal (no pretix event signal).
 """
 
-voucher_form_html = EventPluginSignal(
-    providing_args=['form']
-)
+voucher_form_html = EventPluginSignal()
 """
+Arguments: 'form'
+
 This signal allows you to add additional HTML to the form that is used for modifying vouchers.
 You receive the form object in the ``form`` keyword argument.
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-voucher_form_class = EventPluginSignal(
-    providing_args=['cls']
-)
+voucher_form_class = EventPluginSignal()
 """
+Arguments: 'cls'
+
 This signal allows you to replace the form class that is used for modifying vouchers.
 You will receive the default form class (or the class set by a previous plugin) in the
 ``cls`` argument so that you can inherit from it.
@@ -157,10 +153,10 @@ You will receive the default form class (or the class set by a previous plugin)
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-voucher_form_validation = EventPluginSignal(
-    providing_args=['form']
-)
+voucher_form_validation = EventPluginSignal()
 """
+Arguments: 'form'
+
 This signal allows you to add additional validation to the form that is used for
 creating and modifying vouchers. You will receive the form instance in the ``form``
 argument and the current data state in the ``data`` argument.
@@ -168,28 +164,28 @@ argument and the current data state in the ``data`` argument.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-quota_detail_html = EventPluginSignal(
-    providing_args=['quota']
-)
+quota_detail_html = EventPluginSignal()
 """
+Arguments: 'quota'
+
 This signal allows you to append HTML to a Quota's detail view. You receive the
 quota as argument in the ``quota`` keyword argument.
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-organizer_edit_tabs = DeprecatedSignal(
-    providing_args=['organizer', 'request']
-)
+organizer_edit_tabs = DeprecatedSignal()
 """
+Arguments: 'organizer', 'request'
+
 Deprecated signal, no longer works. We just keep the definition so old plugins don't
 break the installation.
 """
 
-nav_organizer = Signal(
-    providing_args=['organizer', 'request']
-)
+nav_organizer = Signal()
 """
+Arguments: 'organizer', 'request'
+
 This signal is sent out to include tab links on the detail page of an organizer.
 Receivers are expected to return a list of dictionaries. The dictionaries
 should contain at least the keys ``label`` and ``url``. You should also return
@@ -210,30 +206,30 @@ This is a regular django signal (no pretix event signal). Receivers will be pass
 the keyword arguments ``organizer`` and ``request``.
 """
 
-order_info = EventPluginSignal(
-    providing_args=["order", "request"]
-)
+order_info = EventPluginSignal()
 """
+Arguments: ``order``, ``request``
+
 This signal is sent out to display additional information on the order detail page
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 Additionally, the argument ``order`` and ``request`` are available.
 """
 
-order_position_buttons = EventPluginSignal(
-    providing_args=["order", "position", "request"]
-)
+order_position_buttons = EventPluginSignal()
 """
+Arguments: ``order``, ``position``, ``request``
+
 This signal is sent out to display additional buttons for a single position of an order.
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 Additionally, the argument ``order`` and ``request`` are available.
 """
 
-nav_event_settings = EventPluginSignal(
-    providing_args=['request']
-)
+nav_event_settings = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal is sent out to include tab links on the settings page of an event.
 Receivers are expected to return a list of dictionaries. The dictionaries
 should contain at least the keys ``label`` and ``url``. You should also return
@@ -248,10 +244,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 A second keyword argument ``request`` will contain the request object.
 """
 
-event_settings_widget = EventPluginSignal(
-    providing_args=['request']
-)
+event_settings_widget = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal is sent out to include template snippets on the settings page of an event
 that allows generating a pretix Widget code.
 
@@ -259,10 +255,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 A second keyword argument ``request`` will contain the request object.
 """
 
-item_forms = EventPluginSignal(
-    providing_args=['request', 'item']
-)
+item_forms = EventPluginSignal()
 """
+Arguments: 'request', 'item'
+
 This signal allows you to return additional forms that should be rendered on the product
 modification page. You are passed ``request`` and ``item`` arguments and are expected to return
 an instance of a form class that you bind yourself when appropriate. Your form will be executed
@@ -272,10 +268,10 @@ styles. It is advisable to set a prefix for your form to avoid clashes with othe
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-item_formsets = EventPluginSignal(
-    providing_args=['request', 'item']
-)
+item_formsets = EventPluginSignal()
 """
+Arguments: 'request', 'item'
+
 This signal allows you to return additional formsets that should be rendered on the product
 modification page. You are passed ``request`` and ``item`` arguments and are expected to return
 an instance of a formset class that you bind yourself when appropriate. Your formset will be
@@ -290,10 +286,10 @@ will be passed a ``formset`` variable with your formset.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-subevent_forms = EventPluginSignal(
-    providing_args=['request', 'subevent', 'copy_from']
-)
+subevent_forms = EventPluginSignal()
 """
+Arguments: 'request', 'subevent', 'copy_from'
+
 This signal allows you to return additional forms that should be rendered on the subevent creation
 or modification page. You are passed ``request`` and ``subevent`` arguments and are expected to return
 an instance of a form class that you bind yourself when appropriate. Your form will be executed
@@ -307,17 +303,17 @@ creation, ``copy_from`` can be a subevent that is being copied from.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-oauth_application_registered = Signal(
-    providing_args=["user", "application"]
-)
+oauth_application_registered = Signal()
 """
+Arguments: ``user``, ``application``
+
 This signal will be called whenever a user registers a new OAuth application.
 """
 
-order_search_filter_q = Signal(
-    providing_args=["query"]
-)
+order_search_filter_q = Signal()
 """
+Arguments: ``query``
+
 This signal will be called whenever a free-text order search is performed. You are expected to return one
 Q object that will be OR-ed with existing search queries. As order search exists on a global level as well,
 this is not an Event signal and will be called even if your plugin is not active. ``sender`` will contain the
@@ -325,10 +321,10 @@ event if the search is performed within an event, and ``None`` otherwise. The se
 ``query``.
 """
 
-order_search_forms = EventPluginSignal(
-    providing_args=['request']
-)
+order_search_forms = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal allows you to return additional forms that should be rendered in the advanced order search.
 You are passed ``request`` argument and are expected to return an instance of a form class that you bind
 yourself when appropriate. Your form will be executed as part of the standard validation and rendering

src/pretix/control/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from django.views.generic.base import RedirectView
 
 from pretix.control.views import (
@@ -8,310 +8,327 @@ from pretix.control.views import (
 )
 
 urlpatterns = [
-    url(r'^logout$', auth.logout, name='auth.logout'),
-    url(r'^login$', auth.login, name='auth.login'),
-    url(r'^login/2fa$', auth.Login2FAView.as_view(), name='auth.login.2fa'),
-    url(r'^register$', auth.register, name='auth.register'),
-    url(r'^invite/(?P<token>[a-zA-Z0-9]+)$', auth.invite, name='auth.invite'),
-    url(r'^forgot$', auth.Forgot.as_view(), name='auth.forgot'),
-    url(r'^forgot/recover$', auth.Recover.as_view(), name='auth.forgot.recover'),
-    url(r'^$', dashboards.user_index, name='index'),
-    url(r'^widgets.json$', dashboards.user_index_widgets_lazy, name='index.widgets'),
-    url(r'^global/settings/$', global_settings.GlobalSettingsView.as_view(), name='global.settings'),
-    url(r'^global/update/$', global_settings.UpdateCheckView.as_view(), name='global.update'),
-    url(r'^global/message/$', global_settings.MessageView.as_view(), name='global.message'),
-    url(r'^logdetail/$', global_settings.LogDetailView.as_view(), name='global.logdetail'),
-    url(r'^logdetail/payment/$', global_settings.PaymentDetailView.as_view(), name='global.paymentdetail'),
-    url(r'^logdetail/refund/$', global_settings.RefundDetailView.as_view(), name='global.refunddetail'),
-    url(r'^geocode/$', geo.GeoCodeView.as_view(), name='global.geocode'),
-    url(r'^reauth/$', user.ReauthView.as_view(), name='user.reauth'),
-    url(r'^sudo/$', user.StartStaffSession.as_view(), name='user.sudo'),
-    url(r'^sudo/stop/$', user.StopStaffSession.as_view(), name='user.sudo.stop'),
-    url(r'^sudo/(?P<id>\d+)/$', user.EditStaffSession.as_view(), name='user.sudo.edit'),
-    url(r'^sudo/sessions/$', user.StaffSessionList.as_view(), name='user.sudo.list'),
-    url(r'^users/$', users.UserListView.as_view(), name='users'),
-    url(r'^users/select2$', typeahead.users_select2, name='users.select2'),
-    url(r'^users/add$', users.UserCreateView.as_view(), name='users.add'),
-    url(r'^users/impersonate/stop', users.UserImpersonateStopView.as_view(), name='users.impersonate.stop'),
-    url(r'^users/(?P<id>\d+)/$', users.UserEditView.as_view(), name='users.edit'),
-    url(r'^users/(?P<id>\d+)/reset$', users.UserResetView.as_view(), name='users.reset'),
-    url(r'^users/(?P<id>\d+)/impersonate', users.UserImpersonateView.as_view(), name='users.impersonate'),
-    url(r'^users/(?P<id>\d+)/anonymize', users.UserAnonymizeView.as_view(), name='users.anonymize'),
-    url(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
-    url(r'^settings/?$', user.UserSettings.as_view(), name='user.settings'),
-    url(r'^settings/history/$', user.UserHistoryView.as_view(), name='user.settings.history'),
-    url(r'^settings/notifications/$', user.UserNotificationsEditView.as_view(), name='user.settings.notifications'),
-    url(r'^settings/notifications/off/(?P<id>\d+)/(?P<token>[^/]+)/$', user.UserNotificationsDisableView.as_view(),
-        name='user.settings.notifications.off'),
-    url(r'^settings/oauth/authorized/$', oauth.AuthorizationListView.as_view(),
-        name='user.settings.oauth.list'),
-    url(r'^settings/oauth/authorized/(?P<pk>\d+)/revoke$', oauth.AuthorizationRevokeView.as_view(),
-        name='user.settings.oauth.revoke'),
-    url(r'^settings/oauth/apps/$', oauth.OAuthApplicationListView.as_view(),
-        name='user.settings.oauth.apps'),
-    url(r'^settings/oauth/apps/add$', oauth.OAuthApplicationRegistrationView.as_view(),
-        name='user.settings.oauth.apps.register'),
-    url(r'^settings/oauth/apps/(?P<pk>\d+)/$', oauth.OAuthApplicationUpdateView.as_view(),
-        name='user.settings.oauth.app'),
-    url(r'^settings/oauth/apps/(?P<pk>\d+)/disable$', oauth.OAuthApplicationDeleteView.as_view(),
-        name='user.settings.oauth.app.disable'),
-    url(r'^settings/oauth/apps/(?P<pk>\d+)/roll$', oauth.OAuthApplicationRollView.as_view(),
-        name='user.settings.oauth.app.roll'),
-    url(r'^settings/2fa/$', user.User2FAMainView.as_view(), name='user.settings.2fa'),
-    url(r'^settings/2fa/add$', user.User2FADeviceAddView.as_view(), name='user.settings.2fa.add'),
-    url(r'^settings/2fa/enable', user.User2FAEnableView.as_view(), name='user.settings.2fa.enable'),
-    url(r'^settings/2fa/disable', user.User2FADisableView.as_view(), name='user.settings.2fa.disable'),
-    url(r'^settings/2fa/regenemergency', user.User2FARegenerateEmergencyView.as_view(),
-        name='user.settings.2fa.regenemergency'),
-    url(r'^settings/2fa/totp/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmTOTPView.as_view(),
-        name='user.settings.2fa.confirm.totp'),
-    url(r'^settings/2fa/webauthn/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmWebAuthnView.as_view(),
-        name='user.settings.2fa.confirm.webauthn'),
-    url(r'^settings/2fa/(?P<devicetype>[^/]+)/(?P<device>[0-9]+)/delete', user.User2FADeviceDeleteView.as_view(),
-        name='user.settings.2fa.delete'),
-    url(r'^organizers/$', organizer.OrganizerList.as_view(), name='organizers'),
-    url(r'^organizers/add$', organizer.OrganizerCreate.as_view(), name='organizers.add'),
-    url(r'^organizers/select2$', typeahead.organizer_select2, name='organizers.select2'),
-    url(r'^organizer/(?P<organizer>[^/]+)/$', organizer.OrganizerDetail.as_view(), name='organizer'),
-    url(r'^organizer/(?P<organizer>[^/]+)/edit$', organizer.OrganizerUpdate.as_view(), name='organizer.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/delete$', organizer.OrganizerDelete.as_view(), name='organizer.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/settings/display$', organizer.OrganizerDisplaySettings.as_view(),
-        name='organizer.display'),
-    url(r'^organizer/(?P<organizer>[^/]+)/properties$', organizer.EventMetaPropertyListView.as_view(), name='organizer.properties'),
-    url(r'^organizer/(?P<organizer>[^/]+)/property/add$', organizer.EventMetaPropertyCreateView.as_view(),
-        name='organizer.property.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/edit$', organizer.EventMetaPropertyUpdateView.as_view(),
-        name='organizer.property.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/delete$', organizer.EventMetaPropertyDeleteView.as_view(),
-        name='organizer.property.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcards$', organizer.GiftCardListView.as_view(), name='organizer.giftcards'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcard/add$', organizer.GiftCardCreateView.as_view(), name='organizer.giftcard.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/$', organizer.GiftCardDetailView.as_view(), name='organizer.giftcard'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/edit$', organizer.GiftCardUpdateView.as_view(),
-        name='organizer.giftcard.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhooks$', organizer.WebHookListView.as_view(), name='organizer.webhooks'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhook/add$', organizer.WebHookCreateView.as_view(),
-        name='organizer.webhook.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/edit$', organizer.WebHookUpdateView.as_view(),
-        name='organizer.webhook.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/logs$', organizer.WebHookLogsView.as_view(),
-        name='organizer.webhook.logs'),
-    url(r'^organizer/(?P<organizer>[^/]+)/devices$', organizer.DeviceListView.as_view(), name='organizer.devices'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/add$', organizer.DeviceCreateView.as_view(),
-        name='organizer.device.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/edit$', organizer.DeviceUpdateView.as_view(),
-        name='organizer.device.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/connect$', organizer.DeviceConnectView.as_view(),
-        name='organizer.device.connect'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/revoke$', organizer.DeviceRevokeView.as_view(),
-        name='organizer.device.revoke'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/logs$', organizer.DeviceLogView.as_view(),
-        name='organizer.device.logs'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gates$', organizer.GateListView.as_view(), name='organizer.gates'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gate/add$', organizer.GateCreateView.as_view(), name='organizer.gate.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/edit$', organizer.GateUpdateView.as_view(),
-        name='organizer.gate.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/delete$', organizer.GateDeleteView.as_view(),
-        name='organizer.gate.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/teams$', organizer.TeamListView.as_view(), name='organizer.teams'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/add$', organizer.TeamCreateView.as_view(), name='organizer.team.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/$', organizer.TeamMemberView.as_view(),
-        name='organizer.team'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/edit$', organizer.TeamUpdateView.as_view(),
-        name='organizer.team.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/delete$', organizer.TeamDeleteView.as_view(),
-        name='organizer.team.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/slugrng', main.SlugRNG.as_view(), name='events.add.slugrng'),
-    url(r'^organizer/(?P<organizer>[^/]+)/logs', organizer.LogView.as_view(), name='organizer.log'),
-    url(r'^organizer/(?P<organizer>[^/]+)/export/$', organizer.ExportView.as_view(), name='organizer.export'),
-    url(r'^organizer/(?P<organizer>[^/]+)/export/do$', organizer.ExportDoView.as_view(), name='organizer.export.do'),
-    url(r'^nav/typeahead/$', typeahead.nav_context_list, name='nav.typeahead'),
-    url(r'^events/$', main.EventList.as_view(), name='events'),
-    url(r'^events/add$', main.EventWizard.as_view(), name='events.add'),
-    url(r'^events/typeahead/$', typeahead.event_list, name='events.typeahead'),
-    url(r'^events/typeahead/meta/$', typeahead.meta_values, name='events.meta.typeahead'),
-    url(r'^search/orders/$', search.OrderSearch.as_view(), name='search.orders'),
-    url(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include([
-        url(r'^$', dashboards.event_index, name='event.index'),
-        url(r'^widgets.json$', dashboards.event_index_widgets_lazy, name='event.index.widgets'),
-        url(r'^live/$', event.EventLive.as_view(), name='event.live'),
-        url(r'^logs/$', event.EventLog.as_view(), name='event.log'),
-        url(r'^delete/$', event.EventDelete.as_view(), name='event.delete'),
-        url(r'^requiredactions/$', event.EventActions.as_view(), name='event.requiredactions'),
-        url(r'^requiredactions/(?P<id>\d+)/discard$', event.EventActionDiscard.as_view(),
-            name='event.requiredaction.discard'),
-        url(r'^comment/$', event.EventComment.as_view(),
-            name='event.comment'),
-        url(r'^quickstart/$', event.QuickSetupView.as_view(), name='event.quick'),
-        url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
-        url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),
-        url(r'^settings/payment/(?P<provider>[^/]+)$', event.PaymentProviderSettings.as_view(),
-            name='event.settings.payment.provider'),
-        url(r'^settings/payment$', event.PaymentSettings.as_view(), name='event.settings.payment'),
-        url(r'^settings/tickets$', event.TicketSettings.as_view(), name='event.settings.tickets'),
-        url(r'^settings/tickets/preview/(?P<output>[^/]+)$', event.TicketSettingsPreview.as_view(),
-            name='event.settings.tickets.preview'),
-        url(r'^settings/email$', event.MailSettings.as_view(), name='event.settings.mail'),
-        url(r'^settings/email/preview$', event.MailSettingsPreview.as_view(), name='event.settings.mail.preview'),
-        url(r'^settings/email/layoutpreview$', event.MailSettingsRendererPreview.as_view(),
-            name='event.settings.mail.preview.layout'),
-        url(r'^settings/cancel', event.CancelSettings.as_view(), name='event.settings.cancel'),
-        url(r'^settings/invoice$', event.InvoiceSettings.as_view(), name='event.settings.invoice'),
-        url(r'^settings/invoice/preview$', event.InvoicePreview.as_view(), name='event.settings.invoice.preview'),
-        url(r'^settings/display', event.DisplaySettings.as_view(), name='event.settings.display'),
-        url(r'^settings/tax/$', event.TaxList.as_view(), name='event.settings.tax'),
-        url(r'^settings/tax/(?P<rule>\d+)/$', event.TaxUpdate.as_view(), name='event.settings.tax.edit'),
-        url(r'^settings/tax/add$', event.TaxCreate.as_view(), name='event.settings.tax.add'),
-        url(r'^settings/tax/(?P<rule>\d+)/delete$', event.TaxDelete.as_view(), name='event.settings.tax.delete'),
-        url(r'^settings/widget$', event.WidgetSettings.as_view(), name='event.settings.widget'),
-        url(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
-        url(r'^pdf/editor/(?P<filename>[^/]+).pdf$', pdf.PdfView.as_view(), name='pdf.background'),
-        url(r'^subevents/$', subevents.SubEventList.as_view(), name='event.subevents'),
-        url(r'^subevents/select2$', typeahead.subevent_select2, name='event.subevents.select2'),
-        url(r'^subevents/(?P<subevent>\d+)/$', subevents.SubEventUpdate.as_view(), name='event.subevent'),
-        url(r'^subevents/(?P<subevent>\d+)/delete$', subevents.SubEventDelete.as_view(),
-            name='event.subevent.delete'),
-        url(r'^subevents/add$', subevents.SubEventCreate.as_view(), name='event.subevents.add'),
-        url(r'^subevents/bulk_add$', subevents.SubEventBulkCreate.as_view(), name='event.subevents.bulk'),
-        url(r'^subevents/bulk_action$', subevents.SubEventBulkAction.as_view(), name='event.subevents.bulkaction'),
-        url(r'^subevents/bulk_edit$', subevents.SubEventBulkEdit.as_view(), name='event.subevents.bulkedit'),
-        url(r'^items/$', item.ItemList.as_view(), name='event.items'),
-        url(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'),
-        url(r'^items/(?P<item>\d+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'),
-        url(r'^items/(?P<item>\d+)/up$', item.item_move_up, name='event.items.up'),
-        url(r'^items/(?P<item>\d+)/down$', item.item_move_down, name='event.items.down'),
-        url(r'^items/(?P<item>\d+)/delete$', item.ItemDelete.as_view(), name='event.items.delete'),
-        url(r'^items/typeahead/meta/$', typeahead.item_meta_values, name='event.items.meta.typeahead'),
-        url(r'^items/select2$', typeahead.items_select2, name='event.items.select2'),
-        url(r'^items/select2/variation$', typeahead.variations_select2, name='event.items.variations.select2'),
-        url(r'^categories/$', item.CategoryList.as_view(), name='event.items.categories'),
-        url(r'^categories/select2$', typeahead.category_select2, name='event.items.categories.select2'),
-        url(r'^categories/(?P<category>\d+)/delete$', item.CategoryDelete.as_view(),
-            name='event.items.categories.delete'),
-        url(r'^categories/(?P<category>\d+)/up$', item.category_move_up, name='event.items.categories.up'),
-        url(r'^categories/(?P<category>\d+)/down$', item.category_move_down,
-            name='event.items.categories.down'),
-        url(r'^categories/(?P<category>\d+)/$', item.CategoryUpdate.as_view(),
-            name='event.items.categories.edit'),
-        url(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'),
-        url(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'),
-        url(r'^questions/reorder$', item.reorder_questions, name='event.items.questions.reorder'),
-        url(r'^questions/(?P<question>\d+)/delete$', item.QuestionDelete.as_view(),
-            name='event.items.questions.delete'),
-        url(r'^questions/(?P<question>\d+)/$', item.QuestionView.as_view(),
-            name='event.items.questions.show'),
-        url(r'^questions/(?P<question>\d+)/change$', item.QuestionUpdate.as_view(),
-            name='event.items.questions.edit'),
-        url(r'^questions/add$', item.QuestionCreate.as_view(), name='event.items.questions.add'),
-        url(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'),
-        url(r'^quotas/(?P<quota>\d+)/$', item.QuotaView.as_view(), name='event.items.quotas.show'),
-        url(r'^quotas/select$', typeahead.quotas_select2, name='event.items.quotas.select2'),
-        url(r'^quotas/(?P<quota>\d+)/change$', item.QuotaUpdate.as_view(), name='event.items.quotas.edit'),
-        url(r'^quotas/(?P<quota>\d+)/delete$', item.QuotaDelete.as_view(),
-            name='event.items.quotas.delete'),
-        url(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'),
-        url(r'^vouchers/$', vouchers.VoucherList.as_view(), name='event.vouchers'),
-        url(r'^vouchers/tags/$', vouchers.VoucherTags.as_view(), name='event.vouchers.tags'),
-        url(r'^vouchers/rng$', vouchers.VoucherRNG.as_view(), name='event.vouchers.rng'),
-        url(r'^vouchers/item_select$', typeahead.itemvarquota_select2, name='event.vouchers.itemselect2'),
-        url(r'^vouchers/(?P<voucher>\d+)/$', vouchers.VoucherUpdate.as_view(), name='event.voucher'),
-        url(r'^vouchers/(?P<voucher>\d+)/delete$', vouchers.VoucherDelete.as_view(),
-            name='event.voucher.delete'),
-        url(r'^vouchers/add$', vouchers.VoucherCreate.as_view(), name='event.vouchers.add'),
-        url(r'^vouchers/go$', vouchers.VoucherGo.as_view(), name='event.vouchers.go'),
-        url(r'^vouchers/bulk_add$', vouchers.VoucherBulkCreate.as_view(), name='event.vouchers.bulk'),
-        url(r'^vouchers/bulk_action$', vouchers.VoucherBulkAction.as_view(), name='event.vouchers.bulkaction'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/transition$', orders.OrderTransition.as_view(),
-            name='event.order.transition'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/resend$', orders.OrderResendLink.as_view(),
-            name='event.order.resendlink'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>\d+)/resend$', orders.OrderResendLink.as_view(),
-            name='event.order.resendlink'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/invoice$', orders.OrderInvoiceCreate.as_view(),
-            name='event.order.geninvoice'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/regenerate$', orders.OrderInvoiceRegenerate.as_view(),
-            name='event.order.regeninvoice'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/reissue$', orders.OrderInvoiceReissue.as_view(),
-            name='event.order.reissueinvoice'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/download/(?P<position>\d+)/(?P<output>[^/]+)/$',
-            orders.OrderDownload.as_view(),
-            name='event.order.download.ticket'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/answer/(?P<answer>[^/]+)/$',
-            orders.AnswerDownload.as_view(),
-            name='event.order.download.answer'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/checkvatid', orders.OrderCheckVATID.as_view(),
-            name='event.order.checkvatid'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/extend$', orders.OrderExtend.as_view(),
-            name='event.order.extend'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/reactivate$', orders.OrderReactivate.as_view(),
-            name='event.order.reactivate'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/contact$', orders.OrderContactChange.as_view(),
-            name='event.order.contact'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/locale', orders.OrderLocaleChange.as_view(),
-            name='event.order.locale'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/comment$', orders.OrderComment.as_view(),
-            name='event.order.comment'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/change$', orders.OrderChange.as_view(),
-            name='event.order.change'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/approve', orders.OrderApprove.as_view(),
-            name='event.order.approve'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/deny$', orders.OrderDeny.as_view(),
-            name='event.order.deny'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/delete$', orders.OrderDelete.as_view(),
-            name='event.order.delete'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/info', orders.OrderModifyInformation.as_view(),
-            name='event.order.info'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/sendmail$', orders.OrderSendMail.as_view(),
-            name='event.order.sendmail'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>[0-9A-Z]+)/sendmail$', orders.OrderPositionSendMail.as_view(),
-            name='event.order.position.sendmail'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/mail_history$', orders.OrderEmailHistory.as_view(),
-            name='event.order.mail_history'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/cancel$', orders.OrderPaymentCancel.as_view(),
-            name='event.order.payments.cancel'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/confirm$', orders.OrderPaymentConfirm.as_view(),
-            name='event.order.payments.confirm'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refund$', orders.OrderRefundView.as_view(),
-            name='event.order.refunds.start'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/cancel$', orders.OrderRefundCancel.as_view(),
-            name='event.order.refunds.cancel'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/process$', orders.OrderRefundProcess.as_view(),
-            name='event.order.refunds.process'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/done$', orders.OrderRefundDone.as_view(),
-            name='event.order.refunds.done'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/cancellationrequests/(?P<req>\d+)/delete$',
-            orders.OrderCancellationRequestDelete.as_view(),
-            name='event.order.cancellationrequests.delete'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/$', orders.OrderDetail.as_view(), name='event.order'),
-        url(r'^invoice/(?P<invoice>[^/]+)$', orders.InvoiceDownload.as_view(),
-            name='event.invoice.download'),
-        url(r'^orders/overview/$', orders.OverView.as_view(), name='event.orders.overview'),
-        url(r'^orders/import/$', orderimport.ImportView.as_view(), name='event.orders.import'),
-        url(r'^orders/import/(?P<file>[^/]+)/$', orderimport.ProcessView.as_view(), name='event.orders.import.process'),
-        url(r'^orders/export/$', orders.ExportView.as_view(), name='event.orders.export'),
-        url(r'^orders/export/do$', orders.ExportDoView.as_view(), name='event.orders.export.do'),
-        url(r'^orders/refunds/$', orders.RefundList.as_view(), name='event.orders.refunds'),
-        url(r'^orders/go$', orders.OrderGo.as_view(), name='event.orders.go'),
-        url(r'^orders/$', orders.OrderList.as_view(), name='event.orders'),
-        url(r'^orders/search$', orders.OrderSearch.as_view(), name='event.orders.search'),
-        url(r'^dangerzone/$', event.DangerZone.as_view(), name='event.dangerzone'),
-        url(r'^cancel/$', orders.EventCancel.as_view(), name='event.cancel'),
-        url(r'^shredder/$', shredder.StartShredView.as_view(), name='event.shredder.start'),
-        url(r'^shredder/export$', shredder.ShredExportView.as_view(), name='event.shredder.export'),
-        url(r'^shredder/download/(?P<file>[^/]+)/$', shredder.ShredDownloadView.as_view(), name='event.shredder.download'),
-        url(r'^shredder/shred', shredder.ShredDoView.as_view(), name='event.shredder.shred'),
-        url(r'^waitinglist/$', waitinglist.WaitingListView.as_view(), name='event.orders.waitinglist'),
-        url(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
-        url(r'^waitinglist/(?P<entry>\d+)/delete$', waitinglist.EntryDelete.as_view(),
-            name='event.orders.waitinglist.delete'),
-        url(r'^checkinlists/$', checkin.CheckinListList.as_view(), name='event.orders.checkinlists'),
-        url(r'^checkinlists/add$', checkin.CheckinListCreate.as_view(), name='event.orders.checkinlists.add'),
-        url(r'^checkinlists/select2$', typeahead.checkinlist_select2, name='event.orders.checkinlists.select2'),
-        url(r'^checkinlists/(?P<list>\d+)/$', checkin.CheckInListShow.as_view(), name='event.orders.checkinlists.show'),
-        url(r'^checkinlists/(?P<list>\d+)/change$', checkin.CheckinListUpdate.as_view(),
-            name='event.orders.checkinlists.edit'),
-        url(r'^checkinlists/(?P<list>\d+)/delete$', checkin.CheckinListDelete.as_view(),
-            name='event.orders.checkinlists.delete'),
+    re_path(r'^logout$', auth.logout, name='auth.logout'),
+    re_path(r'^login$', auth.login, name='auth.login'),
+    re_path(r'^login/2fa$', auth.Login2FAView.as_view(), name='auth.login.2fa'),
+    re_path(r'^register$', auth.register, name='auth.register'),
+    re_path(r'^invite/(?P<token>[a-zA-Z0-9]+)$', auth.invite, name='auth.invite'),
+    re_path(r'^forgot$', auth.Forgot.as_view(), name='auth.forgot'),
+    re_path(r'^forgot/recover$', auth.Recover.as_view(), name='auth.forgot.recover'),
+    re_path(r'^$', dashboards.user_index, name='index'),
+    re_path(r'^widgets.json$', dashboards.user_index_widgets_lazy, name='index.widgets'),
+    re_path(r'^global/settings/$', global_settings.GlobalSettingsView.as_view(), name='global.settings'),
+    re_path(r'^global/update/$', global_settings.UpdateCheckView.as_view(), name='global.update'),
+    re_path(r'^global/message/$', global_settings.MessageView.as_view(), name='global.message'),
+    re_path(r'^logdetail/$', global_settings.LogDetailView.as_view(), name='global.logdetail'),
+    re_path(r'^logdetail/payment/$', global_settings.PaymentDetailView.as_view(), name='global.paymentdetail'),
+    re_path(r'^logdetail/refund/$', global_settings.RefundDetailView.as_view(), name='global.refunddetail'),
+    re_path(r'^geocode/$', geo.GeoCodeView.as_view(), name='global.geocode'),
+    re_path(r'^reauth/$', user.ReauthView.as_view(), name='user.reauth'),
+    re_path(r'^sudo/$', user.StartStaffSession.as_view(), name='user.sudo'),
+    re_path(r'^sudo/stop/$', user.StopStaffSession.as_view(), name='user.sudo.stop'),
+    re_path(r'^sudo/(?P<id>\d+)/$', user.EditStaffSession.as_view(), name='user.sudo.edit'),
+    re_path(r'^sudo/sessions/$', user.StaffSessionList.as_view(), name='user.sudo.list'),
+    re_path(r'^users/$', users.UserListView.as_view(), name='users'),
+    re_path(r'^users/select2$', typeahead.users_select2, name='users.select2'),
+    re_path(r'^users/add$', users.UserCreateView.as_view(), name='users.add'),
+    re_path(r'^users/impersonate/stop', users.UserImpersonateStopView.as_view(), name='users.impersonate.stop'),
+    re_path(r'^users/(?P<id>\d+)/$', users.UserEditView.as_view(), name='users.edit'),
+    re_path(r'^users/(?P<id>\d+)/reset$', users.UserResetView.as_view(), name='users.reset'),
+    re_path(r'^users/(?P<id>\d+)/impersonate', users.UserImpersonateView.as_view(), name='users.impersonate'),
+    re_path(r'^users/(?P<id>\d+)/anonymize', users.UserAnonymizeView.as_view(), name='users.anonymize'),
+    re_path(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
+    re_path(r'^settings/?$', user.UserSettings.as_view(), name='user.settings'),
+    re_path(r'^settings/history/$', user.UserHistoryView.as_view(), name='user.settings.history'),
+    re_path(r'^settings/notifications/$', user.UserNotificationsEditView.as_view(), name='user.settings.notifications'),
+    re_path(r'^settings/notifications/off/(?P<id>\d+)/(?P<token>[^/]+)/$', user.UserNotificationsDisableView.as_view(),
+            name='user.settings.notifications.off'),
+    re_path(r'^settings/oauth/authorized/$', oauth.AuthorizationListView.as_view(),
+            name='user.settings.oauth.list'),
+    re_path(r'^settings/oauth/authorized/(?P<pk>\d+)/revoke$', oauth.AuthorizationRevokeView.as_view(),
+            name='user.settings.oauth.revoke'),
+    re_path(r'^settings/oauth/apps/$', oauth.OAuthApplicationListView.as_view(),
+            name='user.settings.oauth.apps'),
+    re_path(r'^settings/oauth/apps/add$', oauth.OAuthApplicationRegistrationView.as_view(),
+            name='user.settings.oauth.apps.register'),
+    re_path(r'^settings/oauth/apps/(?P<pk>\d+)/$', oauth.OAuthApplicationUpdateView.as_view(),
+            name='user.settings.oauth.app'),
+    re_path(r'^settings/oauth/apps/(?P<pk>\d+)/disable$', oauth.OAuthApplicationDeleteView.as_view(),
+            name='user.settings.oauth.app.disable'),
+    re_path(r'^settings/oauth/apps/(?P<pk>\d+)/roll$', oauth.OAuthApplicationRollView.as_view(),
+            name='user.settings.oauth.app.roll'),
+    re_path(r'^settings/2fa/$', user.User2FAMainView.as_view(), name='user.settings.2fa'),
+    re_path(r'^settings/2fa/add$', user.User2FADeviceAddView.as_view(), name='user.settings.2fa.add'),
+    re_path(r'^settings/2fa/enable', user.User2FAEnableView.as_view(), name='user.settings.2fa.enable'),
+    re_path(r'^settings/2fa/disable', user.User2FADisableView.as_view(), name='user.settings.2fa.disable'),
+    re_path(r'^settings/2fa/regenemergency', user.User2FARegenerateEmergencyView.as_view(),
+            name='user.settings.2fa.regenemergency'),
+    re_path(r'^settings/2fa/totp/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmTOTPView.as_view(),
+            name='user.settings.2fa.confirm.totp'),
+    re_path(r'^settings/2fa/webauthn/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmWebAuthnView.as_view(),
+            name='user.settings.2fa.confirm.webauthn'),
+    re_path(r'^settings/2fa/(?P<devicetype>[^/]+)/(?P<device>[0-9]+)/delete', user.User2FADeviceDeleteView.as_view(),
+            name='user.settings.2fa.delete'),
+    re_path(r'^organizers/$', organizer.OrganizerList.as_view(), name='organizers'),
+    re_path(r'^organizers/add$', organizer.OrganizerCreate.as_view(), name='organizers.add'),
+    re_path(r'^organizers/select2$', typeahead.organizer_select2, name='organizers.select2'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/$', organizer.OrganizerDetail.as_view(), name='organizer'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/edit$', organizer.OrganizerUpdate.as_view(), name='organizer.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/delete$', organizer.OrganizerDelete.as_view(), name='organizer.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/settings/display$', organizer.OrganizerDisplaySettings.as_view(),
+            name='organizer.display'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/properties$', organizer.EventMetaPropertyListView.as_view(),
+            name='organizer.properties'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/property/add$', organizer.EventMetaPropertyCreateView.as_view(),
+            name='organizer.property.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/edit$',
+            organizer.EventMetaPropertyUpdateView.as_view(),
+            name='organizer.property.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/delete$',
+            organizer.EventMetaPropertyDeleteView.as_view(),
+            name='organizer.property.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcards$', organizer.GiftCardListView.as_view(),
+            name='organizer.giftcards'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcard/add$', organizer.GiftCardCreateView.as_view(),
+            name='organizer.giftcard.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/$', organizer.GiftCardDetailView.as_view(),
+            name='organizer.giftcard'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/edit$',
+            organizer.GiftCardUpdateView.as_view(),
+            name='organizer.giftcard.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhooks$', organizer.WebHookListView.as_view(),
+            name='organizer.webhooks'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhook/add$', organizer.WebHookCreateView.as_view(),
+            name='organizer.webhook.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/edit$', organizer.WebHookUpdateView.as_view(),
+            name='organizer.webhook.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/logs$', organizer.WebHookLogsView.as_view(),
+            name='organizer.webhook.logs'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/devices$', organizer.DeviceListView.as_view(), name='organizer.devices'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/add$', organizer.DeviceCreateView.as_view(),
+            name='organizer.device.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/edit$', organizer.DeviceUpdateView.as_view(),
+            name='organizer.device.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/connect$', organizer.DeviceConnectView.as_view(),
+            name='organizer.device.connect'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/revoke$', organizer.DeviceRevokeView.as_view(),
+            name='organizer.device.revoke'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/logs$', organizer.DeviceLogView.as_view(),
+            name='organizer.device.logs'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gates$', organizer.GateListView.as_view(), name='organizer.gates'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gate/add$', organizer.GateCreateView.as_view(),
+            name='organizer.gate.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/edit$', organizer.GateUpdateView.as_view(),
+            name='organizer.gate.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/delete$', organizer.GateDeleteView.as_view(),
+            name='organizer.gate.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/teams$', organizer.TeamListView.as_view(), name='organizer.teams'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/add$', organizer.TeamCreateView.as_view(),
+            name='organizer.team.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/$', organizer.TeamMemberView.as_view(),
+            name='organizer.team'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/edit$', organizer.TeamUpdateView.as_view(),
+            name='organizer.team.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/delete$', organizer.TeamDeleteView.as_view(),
+            name='organizer.team.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/slugrng', main.SlugRNG.as_view(), name='events.add.slugrng'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/logs', organizer.LogView.as_view(), name='organizer.log'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/export/$', organizer.ExportView.as_view(), name='organizer.export'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/export/do$', organizer.ExportDoView.as_view(),
+            name='organizer.export.do'),
+    re_path(r'^nav/typeahead/$', typeahead.nav_context_list, name='nav.typeahead'),
+    re_path(r'^events/$', main.EventList.as_view(), name='events'),
+    re_path(r'^events/add$', main.EventWizard.as_view(), name='events.add'),
+    re_path(r'^events/typeahead/$', typeahead.event_list, name='events.typeahead'),
+    re_path(r'^events/typeahead/meta/$', typeahead.meta_values, name='events.meta.typeahead'),
+    re_path(r'^search/orders/$', search.OrderSearch.as_view(), name='search.orders'),
+    re_path(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include([
+        re_path(r'^$', dashboards.event_index, name='event.index'),
+        re_path(r'^widgets.json$', dashboards.event_index_widgets_lazy, name='event.index.widgets'),
+        re_path(r'^live/$', event.EventLive.as_view(), name='event.live'),
+        re_path(r'^logs/$', event.EventLog.as_view(), name='event.log'),
+        re_path(r'^delete/$', event.EventDelete.as_view(), name='event.delete'),
+        re_path(r'^requiredactions/$', event.EventActions.as_view(), name='event.requiredactions'),
+        re_path(r'^requiredactions/(?P<id>\d+)/discard$', event.EventActionDiscard.as_view(),
+                name='event.requiredaction.discard'),
+        re_path(r'^comment/$', event.EventComment.as_view(),
+                name='event.comment'),
+        re_path(r'^quickstart/$', event.QuickSetupView.as_view(), name='event.quick'),
+        re_path(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
+        re_path(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),
+        re_path(r'^settings/payment/(?P<provider>[^/]+)$', event.PaymentProviderSettings.as_view(),
+                name='event.settings.payment.provider'),
+        re_path(r'^settings/payment$', event.PaymentSettings.as_view(), name='event.settings.payment'),
+        re_path(r'^settings/tickets$', event.TicketSettings.as_view(), name='event.settings.tickets'),
+        re_path(r'^settings/tickets/preview/(?P<output>[^/]+)$', event.TicketSettingsPreview.as_view(),
+                name='event.settings.tickets.preview'),
+        re_path(r'^settings/email$', event.MailSettings.as_view(), name='event.settings.mail'),
+        re_path(r'^settings/email/preview$', event.MailSettingsPreview.as_view(), name='event.settings.mail.preview'),
+        re_path(r'^settings/email/layoutpreview$', event.MailSettingsRendererPreview.as_view(),
+                name='event.settings.mail.preview.layout'),
+        re_path(r'^settings/cancel', event.CancelSettings.as_view(), name='event.settings.cancel'),
+        re_path(r'^settings/invoice$', event.InvoiceSettings.as_view(), name='event.settings.invoice'),
+        re_path(r'^settings/invoice/preview$', event.InvoicePreview.as_view(), name='event.settings.invoice.preview'),
+        re_path(r'^settings/display', event.DisplaySettings.as_view(), name='event.settings.display'),
+        re_path(r'^settings/tax/$', event.TaxList.as_view(), name='event.settings.tax'),
+        re_path(r'^settings/tax/(?P<rule>\d+)/$', event.TaxUpdate.as_view(), name='event.settings.tax.edit'),
+        re_path(r'^settings/tax/add$', event.TaxCreate.as_view(), name='event.settings.tax.add'),
+        re_path(r'^settings/tax/(?P<rule>\d+)/delete$', event.TaxDelete.as_view(), name='event.settings.tax.delete'),
+        re_path(r'^settings/widget$', event.WidgetSettings.as_view(), name='event.settings.widget'),
+        re_path(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
+        re_path(r'^pdf/editor/(?P<filename>[^/]+).pdf$', pdf.PdfView.as_view(), name='pdf.background'),
+        re_path(r'^subevents/$', subevents.SubEventList.as_view(), name='event.subevents'),
+        re_path(r'^subevents/select2$', typeahead.subevent_select2, name='event.subevents.select2'),
+        re_path(r'^subevents/(?P<subevent>\d+)/$', subevents.SubEventUpdate.as_view(), name='event.subevent'),
+        re_path(r'^subevents/(?P<subevent>\d+)/delete$', subevents.SubEventDelete.as_view(),
+                name='event.subevent.delete'),
+        re_path(r'^subevents/add$', subevents.SubEventCreate.as_view(), name='event.subevents.add'),
+        re_path(r'^subevents/bulk_add$', subevents.SubEventBulkCreate.as_view(), name='event.subevents.bulk'),
+        re_path(r'^subevents/bulk_action$', subevents.SubEventBulkAction.as_view(), name='event.subevents.bulkaction'),
+        re_path(r'^subevents/bulk_edit$', subevents.SubEventBulkEdit.as_view(), name='event.subevents.bulkedit'),
+        re_path(r'^items/$', item.ItemList.as_view(), name='event.items'),
+        re_path(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'),
+        re_path(r'^items/(?P<item>\d+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'),
+        re_path(r'^items/(?P<item>\d+)/up$', item.item_move_up, name='event.items.up'),
+        re_path(r'^items/(?P<item>\d+)/down$', item.item_move_down, name='event.items.down'),
+        re_path(r'^items/(?P<item>\d+)/delete$', item.ItemDelete.as_view(), name='event.items.delete'),
+        re_path(r'^items/typeahead/meta/$', typeahead.item_meta_values, name='event.items.meta.typeahead'),
+        re_path(r'^items/select2$', typeahead.items_select2, name='event.items.select2'),
+        re_path(r'^items/select2/variation$', typeahead.variations_select2, name='event.items.variations.select2'),
+        re_path(r'^categories/$', item.CategoryList.as_view(), name='event.items.categories'),
+        re_path(r'^categories/select2$', typeahead.category_select2, name='event.items.categories.select2'),
+        re_path(r'^categories/(?P<category>\d+)/delete$', item.CategoryDelete.as_view(),
+                name='event.items.categories.delete'),
+        re_path(r'^categories/(?P<category>\d+)/up$', item.category_move_up, name='event.items.categories.up'),
+        re_path(r'^categories/(?P<category>\d+)/down$', item.category_move_down,
+                name='event.items.categories.down'),
+        re_path(r'^categories/(?P<category>\d+)/$', item.CategoryUpdate.as_view(),
+                name='event.items.categories.edit'),
+        re_path(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'),
+        re_path(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'),
+        re_path(r'^questions/reorder$', item.reorder_questions, name='event.items.questions.reorder'),
+        re_path(r'^questions/(?P<question>\d+)/delete$', item.QuestionDelete.as_view(),
+                name='event.items.questions.delete'),
+        re_path(r'^questions/(?P<question>\d+)/$', item.QuestionView.as_view(),
+                name='event.items.questions.show'),
+        re_path(r'^questions/(?P<question>\d+)/change$', item.QuestionUpdate.as_view(),
+                name='event.items.questions.edit'),
+        re_path(r'^questions/add$', item.QuestionCreate.as_view(), name='event.items.questions.add'),
+        re_path(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'),
+        re_path(r'^quotas/(?P<quota>\d+)/$', item.QuotaView.as_view(), name='event.items.quotas.show'),
+        re_path(r'^quotas/select$', typeahead.quotas_select2, name='event.items.quotas.select2'),
+        re_path(r'^quotas/(?P<quota>\d+)/change$', item.QuotaUpdate.as_view(), name='event.items.quotas.edit'),
+        re_path(r'^quotas/(?P<quota>\d+)/delete$', item.QuotaDelete.as_view(),
+                name='event.items.quotas.delete'),
+        re_path(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'),
+        re_path(r'^vouchers/$', vouchers.VoucherList.as_view(), name='event.vouchers'),
+        re_path(r'^vouchers/tags/$', vouchers.VoucherTags.as_view(), name='event.vouchers.tags'),
+        re_path(r'^vouchers/rng$', vouchers.VoucherRNG.as_view(), name='event.vouchers.rng'),
+        re_path(r'^vouchers/item_select$', typeahead.itemvarquota_select2, name='event.vouchers.itemselect2'),
+        re_path(r'^vouchers/(?P<voucher>\d+)/$', vouchers.VoucherUpdate.as_view(), name='event.voucher'),
+        re_path(r'^vouchers/(?P<voucher>\d+)/delete$', vouchers.VoucherDelete.as_view(),
+                name='event.voucher.delete'),
+        re_path(r'^vouchers/add$', vouchers.VoucherCreate.as_view(), name='event.vouchers.add'),
+        re_path(r'^vouchers/go$', vouchers.VoucherGo.as_view(), name='event.vouchers.go'),
+        re_path(r'^vouchers/bulk_add$', vouchers.VoucherBulkCreate.as_view(), name='event.vouchers.bulk'),
+        re_path(r'^vouchers/bulk_action$', vouchers.VoucherBulkAction.as_view(), name='event.vouchers.bulkaction'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/transition$', orders.OrderTransition.as_view(),
+                name='event.order.transition'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/resend$', orders.OrderResendLink.as_view(),
+                name='event.order.resendlink'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>\d+)/resend$', orders.OrderResendLink.as_view(),
+                name='event.order.resendlink'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/invoice$', orders.OrderInvoiceCreate.as_view(),
+                name='event.order.geninvoice'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/regenerate$',
+                orders.OrderInvoiceRegenerate.as_view(),
+                name='event.order.regeninvoice'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/reissue$', orders.OrderInvoiceReissue.as_view(),
+                name='event.order.reissueinvoice'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/download/(?P<position>\d+)/(?P<output>[^/]+)/$',
+                orders.OrderDownload.as_view(),
+                name='event.order.download.ticket'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/answer/(?P<answer>[^/]+)/$',
+                orders.AnswerDownload.as_view(),
+                name='event.order.download.answer'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/checkvatid', orders.OrderCheckVATID.as_view(),
+                name='event.order.checkvatid'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/extend$', orders.OrderExtend.as_view(),
+                name='event.order.extend'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/reactivate$', orders.OrderReactivate.as_view(),
+                name='event.order.reactivate'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/contact$', orders.OrderContactChange.as_view(),
+                name='event.order.contact'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/locale', orders.OrderLocaleChange.as_view(),
+                name='event.order.locale'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/comment$', orders.OrderComment.as_view(),
+                name='event.order.comment'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/change$', orders.OrderChange.as_view(),
+                name='event.order.change'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/approve', orders.OrderApprove.as_view(),
+                name='event.order.approve'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/deny$', orders.OrderDeny.as_view(),
+                name='event.order.deny'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/delete$', orders.OrderDelete.as_view(),
+                name='event.order.delete'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/info', orders.OrderModifyInformation.as_view(),
+                name='event.order.info'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/sendmail$', orders.OrderSendMail.as_view(),
+                name='event.order.sendmail'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>[0-9A-Z]+)/sendmail$',
+                orders.OrderPositionSendMail.as_view(),
+                name='event.order.position.sendmail'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/mail_history$', orders.OrderEmailHistory.as_view(),
+                name='event.order.mail_history'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/cancel$', orders.OrderPaymentCancel.as_view(),
+                name='event.order.payments.cancel'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/confirm$', orders.OrderPaymentConfirm.as_view(),
+                name='event.order.payments.confirm'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refund$', orders.OrderRefundView.as_view(),
+                name='event.order.refunds.start'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/cancel$', orders.OrderRefundCancel.as_view(),
+                name='event.order.refunds.cancel'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/process$', orders.OrderRefundProcess.as_view(),
+                name='event.order.refunds.process'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/done$', orders.OrderRefundDone.as_view(),
+                name='event.order.refunds.done'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/cancellationrequests/(?P<req>\d+)/delete$',
+                orders.OrderCancellationRequestDelete.as_view(),
+                name='event.order.cancellationrequests.delete'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/$', orders.OrderDetail.as_view(), name='event.order'),
+        re_path(r'^invoice/(?P<invoice>[^/]+)$', orders.InvoiceDownload.as_view(),
+                name='event.invoice.download'),
+        re_path(r'^orders/overview/$', orders.OverView.as_view(), name='event.orders.overview'),
+        re_path(r'^orders/import/$', orderimport.ImportView.as_view(), name='event.orders.import'),
+        re_path(r'^orders/import/(?P<file>[^/]+)/$', orderimport.ProcessView.as_view(),
+                name='event.orders.import.process'),
+        re_path(r'^orders/export/$', orders.ExportView.as_view(), name='event.orders.export'),
+        re_path(r'^orders/export/do$', orders.ExportDoView.as_view(), name='event.orders.export.do'),
+        re_path(r'^orders/refunds/$', orders.RefundList.as_view(), name='event.orders.refunds'),
+        re_path(r'^orders/go$', orders.OrderGo.as_view(), name='event.orders.go'),
+        re_path(r'^orders/$', orders.OrderList.as_view(), name='event.orders'),
+        re_path(r'^orders/search$', orders.OrderSearch.as_view(), name='event.orders.search'),
+        re_path(r'^dangerzone/$', event.DangerZone.as_view(), name='event.dangerzone'),
+        re_path(r'^cancel/$', orders.EventCancel.as_view(), name='event.cancel'),
+        re_path(r'^shredder/$', shredder.StartShredView.as_view(), name='event.shredder.start'),
+        re_path(r'^shredder/export$', shredder.ShredExportView.as_view(), name='event.shredder.export'),
+        re_path(r'^shredder/download/(?P<file>[^/]+)/$', shredder.ShredDownloadView.as_view(),
+                name='event.shredder.download'),
+        re_path(r'^shredder/shred', shredder.ShredDoView.as_view(), name='event.shredder.shred'),
+        re_path(r'^waitinglist/$', waitinglist.WaitingListView.as_view(), name='event.orders.waitinglist'),
+        re_path(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
+        re_path(r'^waitinglist/(?P<entry>\d+)/delete$', waitinglist.EntryDelete.as_view(),
+                name='event.orders.waitinglist.delete'),
+        re_path(r'^checkinlists/$', checkin.CheckinListList.as_view(), name='event.orders.checkinlists'),
+        re_path(r'^checkinlists/add$', checkin.CheckinListCreate.as_view(), name='event.orders.checkinlists.add'),
+        re_path(r'^checkinlists/select2$', typeahead.checkinlist_select2, name='event.orders.checkinlists.select2'),
+        re_path(r'^checkinlists/(?P<list>\d+)/$', checkin.CheckInListShow.as_view(),
+                name='event.orders.checkinlists.show'),
+        re_path(r'^checkinlists/(?P<list>\d+)/change$', checkin.CheckinListUpdate.as_view(),
+                name='event.orders.checkinlists.edit'),
+        re_path(r'^checkinlists/(?P<list>\d+)/delete$', checkin.CheckinListDelete.as_view(),
+                name='event.orders.checkinlists.delete'),
     ])),
-    url(r'^event/(?P<organizer>[^/]+)/$', RedirectView.as_view(pattern_name='control:organizer'), name='event.organizerredirect'),
+    re_path(r'^event/(?P<organizer>[^/]+)/$', RedirectView.as_view(pattern_name='control:organizer'),
+            name='event.organizerredirect'),
 ]

src/pretix/control/views/__init__.py

@@ -1,4 +1,4 @@
-import collections
+import collections.abc
 import warnings
 
 from django.core.paginator import (
@@ -65,7 +65,7 @@ class PaginationMixin:
         return ctx
 
 
-class LargeResultSetPage(collections.Sequence):
+class LargeResultSetPage(collections.abc.Sequence):
 
     def __init__(self, object_list, number, paginator):
         self.object_list = object_list

src/pretix/helpers/models.py

@@ -1,5 +1,6 @@
 import copy
 
+from django.core.files import File
 from django.db import models
 
 
@@ -16,7 +17,8 @@ def modelcopy(obj: models.Model):
     n = obj.__class__()
     for f in obj._meta.fields:
         val = getattr(obj, f.name)
-        if isinstance(val, models.Model):
+        print(f, f.name, val)
+        if isinstance(val, (models.Model, File)):
             setattr(n, f.name, copy.copy(val))
         else:
             setattr(n, f.name, copy.deepcopy(val))

src/pretix/multidomain/event_domain_urlconf.py

@@ -1,15 +1,15 @@
 import importlib.util
 
 from django.apps import apps
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 
 from pretix.multidomain.plugin_handler import plugin_event_urls
 from pretix.presale.urls import event_patterns, locale_patterns
 from pretix.urls import common_patterns
 
 presale_patterns = [
-    url(r'', include((locale_patterns + [
-        url(r'', include(event_patterns)),
+    re_path(r'', include((locale_patterns + [
+        re_path(r'', include(event_patterns)),
     ], 'presale')))
 ]
 
@@ -21,11 +21,11 @@ for app in apps.get_app_configs():
             if hasattr(urlmod, 'event_patterns'):
                 patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name)
                 raw_plugin_patterns.append(
-                    url(r'', include((patterns, app.label)))
+                    re_path(r'', include((patterns, app.label)))
                 )
 
 plugin_patterns = [
-    url(r'', include((raw_plugin_patterns, 'plugins')))
+    re_path(r'', include((raw_plugin_patterns, 'plugins')))
 ]
 
 # The presale namespace comes last, because it contains a wildcard catch

src/pretix/multidomain/maindomain_urlconf.py

@@ -1,7 +1,7 @@
 import importlib.util
 
 from django.apps import apps
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from django.views.generic import TemplateView
 
 from pretix.multidomain.plugin_handler import plugin_event_urls
@@ -11,10 +11,10 @@ from pretix.presale.urls import (
 from pretix.urls import common_patterns
 
 presale_patterns_main = [
-    url(r'', include((locale_patterns + [
-        url(r'^(?P<organizer>[^/]+)/', include(organizer_patterns)),
-        url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(event_patterns)),
-        url(r'^$', TemplateView.as_view(template_name='pretixpresale/index.html'), name="index")
+    re_path(r'', include((locale_patterns + [
+        re_path(r'^(?P<organizer>[^/]+)/', include(organizer_patterns)),
+        re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(event_patterns)),
+        re_path(r'^$', TemplateView.as_view(template_name='pretixpresale/index.html'), name="index")
     ], 'presale')))
 ]
 
@@ -28,18 +28,18 @@ for app in apps.get_app_configs():
                 single_plugin_patterns += urlmod.urlpatterns
             if hasattr(urlmod, 'event_patterns'):
                 patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name)
-                single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
-                                                  include(patterns)))
+                single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
+                                                      include(patterns)))
             if hasattr(urlmod, 'organizer_patterns'):
                 patterns = urlmod.organizer_patterns
-                single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/',
-                                                  include(patterns)))
+                single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/',
+                                                      include(patterns)))
             raw_plugin_patterns.append(
-                url(r'', include((single_plugin_patterns, app.label)))
+                re_path(r'', include((single_plugin_patterns, app.label)))
             )
 
 plugin_patterns = [
-    url(r'', include((raw_plugin_patterns, 'plugins')))
+    re_path(r'', include((raw_plugin_patterns, 'plugins')))
 ]
 
 # The presale namespace comes last, because it contains a wildcard catch

src/pretix/multidomain/organizer_domain_urlconf.py

@@ -1,7 +1,7 @@
 import importlib.util
 
 from django.apps import apps
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 
 from pretix.multidomain.plugin_handler import plugin_event_urls
 from pretix.presale.urls import (
@@ -10,9 +10,9 @@ from pretix.presale.urls import (
 from pretix.urls import common_patterns
 
 presale_patterns = [
-    url(r'', include((locale_patterns + [
-        url(r'', include(organizer_patterns)),
-        url(r'^(?P<event>[^/]+)/', include(event_patterns)),
+    re_path(r'', include((locale_patterns + [
+        re_path(r'', include(organizer_patterns)),
+        re_path(r'^(?P<event>[^/]+)/', include(event_patterns)),
     ], 'presale')))
 ]
 
@@ -24,16 +24,16 @@ for app in apps.get_app_configs():
             if hasattr(urlmod, 'event_patterns'):
                 patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name)
                 raw_plugin_patterns.append(
-                    url(r'^(?P<event>[^/]+)/', include((patterns, app.label)))
+                    re_path(r'^(?P<event>[^/]+)/', include((patterns, app.label)))
                 )
             if hasattr(urlmod, 'organizer_patterns'):
                 patterns = urlmod.organizer_patterns
                 raw_plugin_patterns.append(
-                    url(r'', include((patterns, app.label)))
+                    re_path(r'', include((patterns, app.label)))
                 )
 
 plugin_patterns = [
-    url(r'', include((raw_plugin_patterns, 'plugins')))
+    re_path(r'', include((raw_plugin_patterns, 'plugins')))
 ]
 
 # The presale namespace comes last, because it contains a wildcard catch

src/pretix/plugins/badges/exporters.py

@@ -5,14 +5,12 @@ from io import BytesIO
 from typing import Tuple
 
 from django import forms
-from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.core.files import File
 from django.core.files.storage import default_storage
 from django.db.models import Exists, OuterRef
 from django.db.models.functions import Coalesce
 from django.utils.translation import gettext as _, gettext_lazy
-from jsonfallback.functions import JSONExtract
 from reportlab.lib import pagesizes
 from reportlab.lib.units import mm
 from reportlab.pdfgen import canvas
@@ -242,10 +240,10 @@ class BadgeExporter(BaseExporter):
                      choices=[
                          ('name', _('Attendee name')),
                          ('code', _('Order code')),
-                     ] + ([
+                     ] + [
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
-                     ] if settings.JSON_FIELD_AVAILABLE and len(name_scheme['fields']) > 1 else []),
+                     ],
                  )),
             ]
         )
@@ -275,10 +273,8 @@ class BadgeExporter(BaseExporter):
             qs = qs.annotate(
                 resolved_name=Coalesce('attendee_name_parts', 'addon_to__attendee_name_parts',
                                        'order__invoice_address__name_parts')
-            ).annotate(
-                resolved_name_part=JSONExtract('resolved_name', part)
             ).order_by(
-                'resolved_name_part'
+                f'resolved_name__{part}'
             )
 
         outbuffer = render_pdf(self.event, qs, OPTIONS[form_data.get('rendering', 'one')])

src/pretix/plugins/badges/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from pretix.api.urls import event_router
 from pretix.plugins.badges.api import BadgeItemViewSet, BadgeLayoutViewSet
@@ -9,18 +9,18 @@ from .views import (
 )
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/$',
-        LayoutListView.as_view(), name='index'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/print$',
-        OrderPrintDo.as_view(), name='print'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/add$',
-        LayoutCreate.as_view(), name='add'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/default$',
-        LayoutSetDefault.as_view(), name='default'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/delete$',
-        LayoutDelete.as_view(), name='delete'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/editor',
-        LayoutEditorView.as_view(), name='edit'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/$',
+            LayoutListView.as_view(), name='index'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/print$',
+            OrderPrintDo.as_view(), name='print'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/add$',
+            LayoutCreate.as_view(), name='add'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/default$',
+            LayoutSetDefault.as_view(), name='default'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/delete$',
+            LayoutDelete.as_view(), name='delete'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/editor',
+            LayoutEditorView.as_view(), name='edit'),
 ]
 event_router.register('badgelayouts', BadgeLayoutViewSet)
 event_router.register('badgeitems', BadgeItemViewSet)

src/pretix/plugins/banktransfer/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from pretix.api.urls import orga_router
 from pretix.plugins.banktransfer.api import BankImportJobViewSet
@@ -6,38 +6,38 @@ from pretix.plugins.banktransfer.api import BankImportJobViewSet
 from . import views
 
 urlpatterns = [
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/import/',
-        views.OrganizerImportView.as_view(),
-        name='import'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/job/(?P<job>\d+)/',
-        views.OrganizerJobDetailView.as_view(), name='import.job'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/action/',
-        views.OrganizerActionView.as_view(), name='import.action'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/refunds/',
-        views.OrganizerRefundExportListView.as_view(), name='refunds.list'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
-        views.OrganizerDownloadRefundExportView.as_view(),
-        name='refunds.download'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
-        views.OrganizerSepaXMLExportView.as_view(),
-        name='refunds.sepa'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/import/',
+            views.OrganizerImportView.as_view(),
+            name='import'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/job/(?P<job>\d+)/',
+            views.OrganizerJobDetailView.as_view(), name='import.job'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/action/',
+            views.OrganizerActionView.as_view(), name='import.action'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/refunds/',
+            views.OrganizerRefundExportListView.as_view(), name='refunds.list'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
+            views.OrganizerDownloadRefundExportView.as_view(),
+            name='refunds.download'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
+            views.OrganizerSepaXMLExportView.as_view(),
+            name='refunds.sepa'),
 
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/import/',
-        views.EventImportView.as_view(),
-        name='import'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/job/(?P<job>\d+)/',
-        views.EventJobDetailView.as_view(), name='import.job'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/action/',
-        views.EventActionView.as_view(), name='import.action'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/refunds/',
-        views.EventRefundExportListView.as_view(),
-        name='refunds.list'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
-        views.EventDownloadRefundExportView.as_view(),
-        name='refunds.download'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
-        views.EventSepaXMLExportView.as_view(),
-        name='refunds.sepa'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/import/',
+            views.EventImportView.as_view(),
+            name='import'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/job/(?P<job>\d+)/',
+            views.EventJobDetailView.as_view(), name='import.job'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/action/',
+            views.EventActionView.as_view(), name='import.action'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/refunds/',
+            views.EventRefundExportListView.as_view(),
+            name='refunds.list'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
+            views.EventDownloadRefundExportView.as_view(),
+            name='refunds.download'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
+            views.EventSepaXMLExportView.as_view(),
+            name='refunds.sepa'),
 ]
 
 orga_router.register('bankimportjobs', BankImportJobViewSet)

src/pretix/plugins/checkinlists/exporters.py

@@ -3,16 +3,14 @@ from datetime import datetime, time, timedelta
 
 import dateutil.parser
 from django import forms
-from django.conf import settings
 from django.db.models import (
-    Case, Exists, Max, OuterRef, Q, Subquery, Value, When,
+    Case, Exists, Max, OuterRef, Q, Subquery, Value, When, F,
 )
 from django.db.models.functions import Coalesce, NullIf
 from django.urls import reverse
 from django.utils.formats import date_format
 from django.utils.timezone import is_aware, make_aware
 from django.utils.translation import gettext as _, gettext_lazy, pgettext
-from jsonfallback.functions import JSONExtract
 from pytz import UTC
 from reportlab.lib.units import mm
 from reportlab.platypus import Flowable, Paragraph, Spacer, Table, TableStyle
@@ -73,10 +71,10 @@ class CheckInListMixin(BaseExporter):
                      choices=[
                          ('name', _('Attendee name')),
                          ('code', _('Order code')),
-                     ] + ([
+                     ] + [
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
-                     ] if settings.JSON_FIELD_AVAILABLE and len(name_scheme['fields']) > 1 else []),
+                     ],
                      widget=forms.RadioSelect,
                      required=False
                  )),
@@ -180,15 +178,17 @@ class CheckInListMixin(BaseExporter):
             part = sort[5:]
             qs = qs.annotate(
                 resolved_name=Case(
-                    When(attendee_name_cached__ne='', then='attendee_name_parts'),
-                    When(addon_to__attendee_name_cached__isnull=False, addon_to__attendee_name_cached__ne='', then='addon_to__attendee_name_parts'),
-                    default='order__invoice_address__name_parts',
-                )
+                     When(attendee_name_cached__isnull=False, attendee_name_cached__ne='',
+                          then='attendee_name_parts'),
+                     When(addon_to__attendee_name_cached__isnull=False, addon_to__attendee_name_cached__ne='',
+                          then='addon_to__attendee_name_parts'),
+                     default='order__invoice_address__name_parts',
+                ),
             ).annotate(
-                resolved_name_part=JSONExtract('resolved_name', part)
+                resolved_name_part=F(f'resolved_name__{part}')
             ).order_by(
                 *o,
-                'resolved_name_part'
+                f'resolved_name__{part}'
             )
 
         if form_data.get('attention_only'):

src/pretix/plugins/paypal/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 
 from pretix.multidomain import event_url
 
@@ -7,22 +7,21 @@ from .views import (
 )
 
 event_patterns = [
-    url(r'^paypal/', include([
-        url(r'^abort/$', abort, name='abort'),
-        url(r'^return/$', success, name='return'),
-        url(r'^redirect/$', redirect_view, name='redirect'),
+    re_path(r'^paypal/', include([
+        re_path(r'^abort/$', abort, name='abort'),
+        re_path(r'^return/$', success, name='return'),
+        re_path(r'^redirect/$', redirect_view, name='redirect'),
 
-        url(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/abort/', abort, name='abort'),
-        url(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/return/', success, name='return'),
+        re_path(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/abort/', abort, name='abort'),
+        re_path(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/return/', success, name='return'),
 
         event_url(r'^webhook/$', webhook, name='webhook', require_live=False),
     ])),
 ]
 
-
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/paypal/disconnect/',
-        oauth_disconnect, name='oauth.disconnect'),
-    url(r'^_paypal/webhook/$', webhook, name='webhook'),
-    url(r'^_paypal/oauth_return/$', oauth_return, name='oauth.return'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/paypal/disconnect/',
+            oauth_disconnect, name='oauth.disconnect'),
+    re_path(r'^_paypal/webhook/$', webhook, name='webhook'),
+    re_path(r'^_paypal/oauth_return/$', oauth_return, name='oauth.return'),
 ]

src/pretix/plugins/returnurl/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from .views import ReturnSettings
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/returnurl/settings$',
-        ReturnSettings.as_view(), name='settings'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/returnurl/settings$',
+            ReturnSettings.as_view(), name='settings'),
 ]

src/pretix/plugins/sendmail/urls.py

@@ -1,9 +1,10 @@
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from . import views
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/$', views.SenderView.as_view(),
-        name='send'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/history/', views.EmailHistoryView.as_view(), name='history')
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/$', views.SenderView.as_view(),
+            name='send'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/history/', views.EmailHistoryView.as_view(),
+            name='history')
 ]

src/pretix/plugins/statistics/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from . import views
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/statistics/', views.IndexView.as_view(),
-        name='index'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/statistics/', views.IndexView.as_view(),
+            name='index'),
 ]

src/pretix/plugins/stripe/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 
 from pretix.multidomain import event_url
 
@@ -9,30 +9,30 @@ from .views import (
 )
 
 event_patterns = [
-    url(r'^stripe/', include([
+    re_path(r'^stripe/', include([
         event_url(r'^webhook/$', webhook, name='webhook', require_live=False),
-        url(r'^redirect/$', redirect_view, name='redirect'),
-        url(r'^return/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ReturnView.as_view(), name='return'),
-        url(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ScaView.as_view(), name='sca'),
-        url(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/return/$',
-            ScaReturnView.as_view(), name='sca.return'),
+        re_path(r'^redirect/$', redirect_view, name='redirect'),
+        re_path(r'^return/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ReturnView.as_view(), name='return'),
+        re_path(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ScaView.as_view(), name='sca'),
+        re_path(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/return/$',
+                ScaReturnView.as_view(), name='sca.return'),
     ])),
-    url(r'^.well-known/apple-developer-merchantid-domain-association$',
-        applepay_association, name='applepay.association'),
+    re_path(r'^.well-known/apple-developer-merchantid-domain-association$',
+            applepay_association, name='applepay.association'),
 ]
 
 organizer_patterns = [
-    url(r'^.well-known/apple-developer-merchantid-domain-association$',
-        applepay_association, name='applepay.association'),
+    re_path(r'^.well-known/apple-developer-merchantid-domain-association$',
+            applepay_association, name='applepay.association'),
 ]
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/stripe/disconnect/',
-        oauth_disconnect, name='oauth.disconnect'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/stripeconnect/',
-        OrganizerSettingsFormView.as_view(), name='settings.connect'),
-    url(r'^_stripe/webhook/$', webhook, name='webhook'),
-    url(r'^_stripe/oauth_return/$', oauth_return, name='oauth.return'),
-    url(r'^.well-known/apple-developer-merchantid-domain-association$',
-        applepay_association, name='applepay.association'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/stripe/disconnect/',
+            oauth_disconnect, name='oauth.disconnect'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/stripeconnect/',
+            OrganizerSettingsFormView.as_view(), name='settings.connect'),
+    re_path(r'^_stripe/webhook/$', webhook, name='webhook'),
+    re_path(r'^_stripe/oauth_return/$', oauth_return, name='oauth.return'),
+    re_path(r'^.well-known/apple-developer-merchantid-domain-association$',
+            applepay_association, name='applepay.association'),
 ]

src/pretix/plugins/ticketoutputpdf/exporters.py

@@ -2,11 +2,9 @@ from collections import OrderedDict
 from io import BytesIO
 
 from django import forms
-from django.conf import settings
 from django.core.files.base import ContentFile
 from django.db.models.functions import Coalesce
 from django.utils.translation import gettext as _, gettext_lazy
-from jsonfallback.functions import JSONExtract
 from PyPDF2.merger import PdfFileMerger
 
 from pretix.base.exporter import BaseExporter
@@ -41,7 +39,7 @@ class AllTicketsPDF(BaseExporter):
                      ] + ([
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
-                     ] if settings.JSON_FIELD_AVAILABLE and name_scheme and len(name_scheme['fields']) > 1 else []),
+                     ] if name_scheme else [])
                  )),
             ]
         )
@@ -68,10 +66,8 @@ class AllTicketsPDF(BaseExporter):
             part = form_data['order_by'][5:]
             qs = qs.annotate(
                 resolved_name=Coalesce('attendee_name_parts', 'addon_to__attendee_name_parts', 'order__invoice_address__name_parts')
-            ).annotate(
-                resolved_name_part=JSONExtract('resolved_name', part)
             ).order_by(
-                'resolved_name_part'
+                f'resolved_name__{part}'
             )
 
         o = PdfTicketOutput(Event.objects.none())

src/pretix/plugins/ticketoutputpdf/signals.py

@@ -131,10 +131,10 @@ def pdf_logentry_object_link(sender, logentry, **kwargs):
     return a_text.format_map(a_map)
 
 
-override_layout = EventPluginSignal(
-    providing_args=["layout", "orderposition"]
-)
+override_layout = EventPluginSignal()
 """
+Arguments: ``layout``, ``orderposition``
+
 This signal allows you to forcefully override the ticket layout that is being used to create the ticket PDF. Use with
 care, as this will render any specifically by the organizer selected templates useless.
 

src/pretix/plugins/ticketoutputpdf/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from pretix.api.urls import event_router
 from pretix.plugins.ticketoutputpdf.api import (
@@ -10,18 +10,18 @@ from pretix.plugins.ticketoutputpdf.views import (
 )
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/$',
-        LayoutListView.as_view(), name='index'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/add$',
-        LayoutCreate.as_view(), name='add'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/default$',
-        LayoutSetDefault.as_view(), name='default'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/default$',
-        LayoutGetDefault.as_view(), name='getdefault'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/delete$',
-        LayoutDelete.as_view(), name='delete'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/editor',
-        LayoutEditorView.as_view(), name='edit'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/$',
+            LayoutListView.as_view(), name='index'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/add$',
+            LayoutCreate.as_view(), name='add'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/default$',
+            LayoutSetDefault.as_view(), name='default'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/default$',
+            LayoutGetDefault.as_view(), name='getdefault'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/delete$',
+            LayoutDelete.as_view(), name='delete'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/editor',
+            LayoutEditorView.as_view(), name='edit'),
 ]
 event_router.register('ticketlayouts', TicketLayoutViewSet)
 event_router.register('ticketlayoutitems', TicketLayoutItemViewSet)

src/pretix/presale/signals.py

@@ -2,10 +2,10 @@ from django.dispatch import Signal
 
 from pretix.base.signals import EventPluginSignal
 
-global_html_head = Signal(
-    providing_args=["request"]
-)
+global_html_head = Signal()
 """
+Arguments: ``request``
+
 This signal allows you to put code inside the HTML ``<head>`` tag
 of every page in the frontend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -13,10 +13,10 @@ of every page in the frontend. You will get the request as the keyword argument
 This signal is called regardless of whether your plugin is active for all pages of the system.
 """
 
-global_html_page_header = Signal(
-    providing_args=["request"]
-)
+global_html_page_header = Signal()
 """
+Arguments: ``request``
+
 This signal allows you to put code right in the beginning of the HTML ``<body>`` tag
 of every page in the frontend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -24,10 +24,10 @@ of every page in the frontend. You will get the request as the keyword argument
 This signal is called regardless of whether your plugin is active for all pages of the system.
 """
 
-global_html_footer = Signal(
-    providing_args=["request"]
-)
+global_html_footer = Signal()
 """
+Arguments: ``request``
+
 This signal allows you to put code before the end of the HTML ``<body>`` tag
 of every page in the frontend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -35,10 +35,10 @@ of every page in the frontend. You will get the request as the keyword argument
 This signal is called regardless of whether your plugin is active for all pages of the system.
 """
 
-html_head = EventPluginSignal(
-    providing_args=["request"]
-)
+html_head = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal allows you to put code inside the HTML ``<head>`` tag
 of every page in the frontend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -46,10 +46,10 @@ of every page in the frontend. You will get the request as the keyword argument
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-html_page_header = EventPluginSignal(
-    providing_args=["request"]
-)
+html_page_header = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal allows you to put code right in the beginning of the HTML ``<body>`` tag
 of every page in the frontend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -57,10 +57,10 @@ of every page in the frontend. You will get the request as the keyword argument
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-html_footer = EventPluginSignal(
-    providing_args=["request"]
-)
+html_footer = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal allows you to put code before the end of the HTML ``<body>`` tag
 of every page in the frontend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -68,10 +68,10 @@ of every page in the frontend. You will get the request as the keyword argument
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-sass_preamble = EventPluginSignal(
-    providing_args=["filename"]
-)
+sass_preamble = EventPluginSignal()
 """
+Arguments: ``filename``
+
 This signal allows you to put SASS code at the beginning of the event-specific
 stylesheet. Keep in mind that this will only be called/rebuilt when the user changes
 display settings or pretix gets updated. You will get the filename that is being
@@ -82,10 +82,10 @@ code.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-sass_postamble = EventPluginSignal(
-    providing_args=["filename"]
-)
+sass_postamble = EventPluginSignal()
 """
+Arguments: ``filename``
+
 This signal allows you to put SASS code at the end of the event-specific
 stylesheet. Keep in mind that this will only be called/rebuilt when the user changes
 display settings or pretix gets updated. You will get the filename that is being
@@ -95,20 +95,20 @@ all of pretix' SASS code.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-footer_link = EventPluginSignal(
-    providing_args=["request"]
-)
+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``.
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-global_footer_link = Signal(
-    providing_args=["request"]
-)
+global_footer_link = Signal()
 """
+Arguments: ``request``
+
 The signal ``pretix.presale.signals.global_footer_link`` allows you to add links to the footer of any page. You
 are expected to return a dictionary containing the keys ``label`` and ``url``.
 """
@@ -131,29 +131,29 @@ a subclass of ``pretix.presale.checkoutflow.BaseCheckoutFlowStep``.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-voucher_redeem_info = EventPluginSignal(
-    providing_args=["voucher"]
-)
+voucher_redeem_info = EventPluginSignal()
 """
+Arguments: ``voucher``
+
 This signal is sent out to display additional information on the "redeem a voucher" page
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_meta_from_request = EventPluginSignal(
-    providing_args=["request"]
-)
+order_meta_from_request = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal is sent before an order is created through the pretixpresale frontend. It allows you
 to return a dictionary that will be merged in the meta_info attribute of the order.
 You will receive the request triggering the order creation as the ``request`` keyword argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
-checkout_confirm_page_content = EventPluginSignal(
-    providing_args=['request']
-)
+checkout_confirm_page_content = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signals allows you to add HTML content to the confirmation page that is presented at the
 end of the checkout process, just before the order is being created.
 
@@ -161,10 +161,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 argument will contain the request object.
 """
 
-fee_calculation_for_cart = EventPluginSignal(
-    providing_args=['request', 'invoice_address', 'total', 'positions']
-)
+fee_calculation_for_cart = EventPluginSignal()
 """
+Arguments: 'request', 'invoice_address', 'total', 'positions'
+
 This signals allows you to add fees to a cart. You are expected to return a list of ``OrderFee``
 objects that are not yet saved to the database (because there is no order yet).
 
@@ -175,9 +175,7 @@ You should not rely on this ``total`` value for fee calculations as other fees m
 The ``positions`` argument will contain a list or queryset of ``CartPosition`` objects.
 """
 
-contact_form_fields = EventPluginSignal(
-    providing_args=[]
-)
+contact_form_fields = EventPluginSignal()
 """
 This signals allows you to add form fields to the contact form that is presented during checkout
 and by default only asks for the email address. You are supposed to return a dictionary of
@@ -188,10 +186,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 argument will contain the request object.
 """
 
-contact_form_fields_overrides = EventPluginSignal(
-    providing_args=["request", "order"]
-)
+contact_form_fields_overrides = EventPluginSignal()
 """
+Arguments: ``request``, ``order``
+
 This signal allows you to override fields of the contact form that is presented during checkout
 and by default only asks for the email address. It is also being used for the invoice address
 form. You are supposed to return a dictionary of dictionaries with globally unique keys. The
@@ -203,10 +201,10 @@ argument will contain the request object. The ``order`` argument is ``None`` dur
 process and contains an order if the customer is trying to change an existing order.
 """
 
-question_form_fields = EventPluginSignal(
-    providing_args=["position"]
-)
+question_form_fields = EventPluginSignal()
 """
+Arguments: ``position``
+
 This signals allows you to add form fields to the questions form that is presented during checkout
 and by default asks for the questions configured in the backend. You are supposed to return a dictionary
 of form fields with globally unique keys. The validated form results will be saved into the
@@ -219,10 +217,10 @@ later.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-question_form_fields_overrides = EventPluginSignal(
-    providing_args=["position", "request"]
-)
+question_form_fields_overrides = EventPluginSignal()
 """
+Arguments: ``position``, ``request``
+
 This signal allows you to override fields of the questions form that is presented during checkout
 and by default only asks for the questions configured in the backend. You are supposed to return a
 dictionary of dictionaries with globally unique keys. The value-dictionary should contain one or
@@ -235,46 +233,46 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 argument will contain the request object.
 """
 
-order_info = EventPluginSignal(
-    providing_args=["order", "request"]
-)
+order_info = EventPluginSignal()
 """
+Arguments: ``order``, ``request``
+
 This signal is sent out to display additional information on the order detail page
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-position_info = EventPluginSignal(
-    providing_args=["order", "position", "request"]
-)
+position_info = EventPluginSignal()
 """
+Arguments: ``order``, ``position``, ``request``
+
 This signal is sent out to display additional information on the position detail page
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_info_top = EventPluginSignal(
-    providing_args=["order", "request"]
-)
+order_info_top = EventPluginSignal()
 """
+Arguments: ``order``, ``request``
+
 This signal is sent out to display additional information on top of the order detail page
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-position_info_top = EventPluginSignal(
-    providing_args=["order", "position", "request"]
-)
+position_info_top = EventPluginSignal()
 """
+Arguments: ``order``, ``position``, ``request``
+
 This signal is sent out to display additional information on top of the position detail page
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-process_request = EventPluginSignal(
-    providing_args=["request"]
-)
+process_request = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal is sent out whenever a request is made to a event presale page. Most of the
 time, this will be called from the middleware layer (except on plugin-provided pages
 this will be called by the @event_view decorator). Similarly to Django's process_request
@@ -287,10 +285,10 @@ easy to cause serious performance problems.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-process_response = EventPluginSignal(
-    providing_args=["request", "response"]
-)
+process_response = EventPluginSignal()
 """
+Arguments: ``request``, ``response``
+
 This signal is sent out whenever a response is sent from a event presale page. Most of
 the time, this will be called from the middleware layer (except on plugin-provided pages
 this will be called by the @event_view decorator). Similarly to Django's process_response
@@ -304,10 +302,10 @@ easy to cause serious performance problems.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-front_page_top = EventPluginSignal(
-    providing_args=["request", "subevent"]
-)
+front_page_top = EventPluginSignal()
 """
+Arguments: ``request``, ``subevent``
+
 This signal is sent out to display additional information on the frontpage above the list
 of products and but below a custom frontpage text.
 
@@ -315,10 +313,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 receivers are expected to return HTML.
 """
 
-render_seating_plan = EventPluginSignal(
-    providing_args=["request", "subevent", "voucher"]
-)
+render_seating_plan = EventPluginSignal()
 """
+Arguments: ``request``, ``subevent``, ``voucher``
+
 This signal is sent out to render a seating plan, if one is configured for the specific event.
 You will be passed the ``request`` as a keyword argument. If applicable, a ``subevent`` or
 ``voucher`` argument might be given.
@@ -327,10 +325,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 receivers are expected to return HTML.
 """
 
-front_page_bottom = EventPluginSignal(
-    providing_args=["request", "subevent"]
-)
+front_page_bottom = EventPluginSignal()
 """
+Arguments: ``request``, ``subevent``
+
 This signal is sent out to display additional information on the frontpage below the list
 of products.
 
@@ -338,10 +336,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 receivers are expected to return HTML.
 """
 
-front_page_bottom_widget = EventPluginSignal(
-    providing_args=["request", "subevent"]
-)
+front_page_bottom_widget = EventPluginSignal()
 """
+Arguments: ``request``, ``subevent``
+
 This signal is sent out to display additional information on the frontpage below the list
 of products if the front page is shown in the widget.
 
@@ -349,10 +347,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 receivers are expected to return HTML.
 """
 
-checkout_all_optional = EventPluginSignal(
-    providing_args=['request']
-)
+checkout_all_optional = EventPluginSignal()
 """
+Arguments: 'request'
+
 If any receiver of this signal returns ``True``, all input fields during checkout (contact data,
 invoice address, confirmations) will be optional, except for questions. Use with care!
 
@@ -360,10 +358,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 argument will contain the request object.
 """
 
-item_description = EventPluginSignal(
-    providing_args=["item", "variation"]
-)
+item_description = EventPluginSignal()
 """
+Arguments: ``item``, ``variation``
+
 This signal is sent out when the description of an item or variation is rendered and allows you to append
 additional text to the description. You are passed the ``item`` and ``variation`` and expected to return
 HTML.

src/pretix/presale/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from django.views.decorators.csrf import csrf_exempt
 
 import pretix.presale.views.cart
@@ -17,126 +17,129 @@ import pretix.presale.views.widget
 # configuration is done by the pretix.multidomain package.
 
 frame_wrapped_urls = [
-    url(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'),
-    url(r'^cart/voucher$', pretix.presale.views.cart.CartApplyVoucher.as_view(), name='event.cart.voucher'),
-    url(r'^cart/clear$', pretix.presale.views.cart.CartClear.as_view(), name='event.cart.clear'),
-    url(r'^cart/answer/(?P<answer>[^/]+)/$',
-        pretix.presale.views.cart.AnswerDownload.as_view(),
-        name='event.cart.download.answer'),
-    url(r'^checkout/start$', pretix.presale.views.checkout.CheckoutView.as_view(), name='event.checkout.start'),
-    url(r'^checkout/(?P<step>[^/]+)/$', pretix.presale.views.checkout.CheckoutView.as_view(),
-        name='event.checkout'),
-    url(r'^redeem/?$', pretix.presale.views.cart.RedeemView.as_view(),
-        name='event.redeem'),
-    url(r'^seatingframe/$', pretix.presale.views.event.SeatingPlanView.as_view(),
-        name='event.seatingplan'),
-    url(r'^(?P<subevent>[0-9]+)/seatingframe/$', pretix.presale.views.event.SeatingPlanView.as_view(),
-        name='event.seatingplan'),
-    url(r'^(?P<subevent>[0-9]+)/$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'),
-    url(r'^waitinglist', pretix.presale.views.waiting.WaitingView.as_view(), name='event.waitinglist'),
-    url(r'^$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'),
+    re_path(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'),
+    re_path(r'^cart/voucher$', pretix.presale.views.cart.CartApplyVoucher.as_view(), name='event.cart.voucher'),
+    re_path(r'^cart/clear$', pretix.presale.views.cart.CartClear.as_view(), name='event.cart.clear'),
+    re_path(r'^cart/answer/(?P<answer>[^/]+)/$',
+            pretix.presale.views.cart.AnswerDownload.as_view(),
+            name='event.cart.download.answer'),
+    re_path(r'^checkout/start$', pretix.presale.views.checkout.CheckoutView.as_view(), name='event.checkout.start'),
+    re_path(r'^checkout/(?P<step>[^/]+)/$', pretix.presale.views.checkout.CheckoutView.as_view(),
+            name='event.checkout'),
+    re_path(r'^redeem/?$', pretix.presale.views.cart.RedeemView.as_view(),
+            name='event.redeem'),
+    re_path(r'^seatingframe/$', pretix.presale.views.event.SeatingPlanView.as_view(),
+            name='event.seatingplan'),
+    re_path(r'^(?P<subevent>[0-9]+)/seatingframe/$', pretix.presale.views.event.SeatingPlanView.as_view(),
+            name='event.seatingplan'),
+    re_path(r'^(?P<subevent>[0-9]+)/$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'),
+    re_path(r'^waitinglist', pretix.presale.views.waiting.WaitingView.as_view(), name='event.waitinglist'),
+    re_path(r'^$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'),
 ]
 event_patterns = [
     # Cart/checkout patterns are a bit more complicated, as they should have simple URLs like cart/clear in normal
     # cases, but need to have versions with unguessable URLs like w/8l4Y83XNonjLxoBb/cart/clear to be used in widget
     # mode. This is required to prevent all clickjacking and CSRF attacks that would otherwise be possible.
     # First, we define the normal version. The docstring of get_or_create_cart_id() has more information on this.
-    url(r'', include(frame_wrapped_urls)),
+    re_path(r'', include(frame_wrapped_urls)),
     # Second, the widget version
-    url(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/', include(frame_wrapped_urls)),
+    re_path(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/', include(frame_wrapped_urls)),
     # Third, a fake version that is defined like the first (and never gets called), but makes reversing URLs easier
-    url(r'(?P<cart_namespace>[_]{0})', include(frame_wrapped_urls)),
+    re_path(r'(?P<cart_namespace>[_]{0})', include(frame_wrapped_urls)),
     # CartAdd goes extra since it also gets a csrf_exempt decorator in one of the cases
-    url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'),
-    url(r'^(?P<cart_namespace>[_]{0})cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'),
-    url(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/cart/add',
-        csrf_exempt(pretix.presale.views.cart.CartAdd.as_view()),
-        name='event.cart.add'),
+    re_path(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'),
+    re_path(r'^(?P<cart_namespace>[_]{0})cart/add$', pretix.presale.views.cart.CartAdd.as_view(),
+            name='event.cart.add'),
+    re_path(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/cart/add',
+            csrf_exempt(pretix.presale.views.cart.CartAdd.as_view()),
+            name='event.cart.add'),
 
-    url(r'unlock/(?P<hash>[a-z0-9]{64})/$', pretix.presale.views.user.UnlockHashView.as_view(),
-        name='event.payment.unlock'),
-    url(r'resend/$', pretix.presale.views.user.ResendLinkView.as_view(), name='event.resend_link'),
+    re_path(r'unlock/(?P<hash>[a-z0-9]{64})/$', pretix.presale.views.user.UnlockHashView.as_view(),
+            name='event.payment.unlock'),
+    re_path(r'resend/$', pretix.presale.views.user.ResendLinkView.as_view(), name='event.resend_link'),
 
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/open/(?P<hash>[a-z0-9]+)/$', pretix.presale.views.order.OrderOpen.as_view(),
-        name='event.order.open'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/$', pretix.presale.views.order.OrderDetails.as_view(),
-        name='event.order'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/invoice$',
-        pretix.presale.views.order.OrderInvoiceCreate.as_view(),
-        name='event.order.geninvoice'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/change$',
-        pretix.presale.views.order.OrderChange.as_view(),
-        name='event.order.change'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/cancel$',
-        pretix.presale.views.order.OrderCancel.as_view(),
-        name='event.order.cancel'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/cancel/do$',
-        pretix.presale.views.order.OrderCancelDo.as_view(),
-        name='event.order.cancel.do'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/modify$',
-        pretix.presale.views.order.OrderModify.as_view(),
-        name='event.order.modify'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/(?P<payment>[0-9]+)/$',
-        pretix.presale.views.order.OrderPaymentStart.as_view(),
-        name='event.order.pay'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/(?P<payment>[0-9]+)/confirm$',
-        pretix.presale.views.order.OrderPaymentConfirm.as_view(),
-        name='event.order.pay.confirm'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/(?P<payment>[0-9]+)/complete$',
-        pretix.presale.views.order.OrderPaymentComplete.as_view(),
-        name='event.order.pay.complete'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/change',
-        pretix.presale.views.order.OrderPayChangeMethod.as_view(),
-        name='event.order.pay.change'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/answer/(?P<answer>[^/]+)/$',
-        pretix.presale.views.order.AnswerDownload.as_view(),
-        name='event.order.download.answer'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/download/(?P<output>[^/]+)$',
-        pretix.presale.views.order.OrderDownload.as_view(),
-        name='event.order.download.combined'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/download/(?P<position>[0-9]+)/(?P<output>[^/]+)$',
-        pretix.presale.views.order.OrderDownload.as_view(),
-        name='event.order.download'),
-    url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/invoice/(?P<invoice>[0-9]+)$',
-        pretix.presale.views.order.InvoiceDownload.as_view(),
-        name='event.invoice.download'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/open/(?P<hash>[a-z0-9]+)/$',
+            pretix.presale.views.order.OrderOpen.as_view(),
+            name='event.order.open'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/$', pretix.presale.views.order.OrderDetails.as_view(),
+            name='event.order'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/invoice$',
+            pretix.presale.views.order.OrderInvoiceCreate.as_view(),
+            name='event.order.geninvoice'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/change$',
+            pretix.presale.views.order.OrderChange.as_view(),
+            name='event.order.change'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/cancel$',
+            pretix.presale.views.order.OrderCancel.as_view(),
+            name='event.order.cancel'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/cancel/do$',
+            pretix.presale.views.order.OrderCancelDo.as_view(),
+            name='event.order.cancel.do'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/modify$',
+            pretix.presale.views.order.OrderModify.as_view(),
+            name='event.order.modify'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/(?P<payment>[0-9]+)/$',
+            pretix.presale.views.order.OrderPaymentStart.as_view(),
+            name='event.order.pay'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/(?P<payment>[0-9]+)/confirm$',
+            pretix.presale.views.order.OrderPaymentConfirm.as_view(),
+            name='event.order.pay.confirm'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/(?P<payment>[0-9]+)/complete$',
+            pretix.presale.views.order.OrderPaymentComplete.as_view(),
+            name='event.order.pay.complete'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/pay/change',
+            pretix.presale.views.order.OrderPayChangeMethod.as_view(),
+            name='event.order.pay.change'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/answer/(?P<answer>[^/]+)/$',
+            pretix.presale.views.order.AnswerDownload.as_view(),
+            name='event.order.download.answer'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/download/(?P<output>[^/]+)$',
+            pretix.presale.views.order.OrderDownload.as_view(),
+            name='event.order.download.combined'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/download/(?P<position>[0-9]+)/(?P<output>[^/]+)$',
+            pretix.presale.views.order.OrderDownload.as_view(),
+            name='event.order.download'),
+    re_path(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/invoice/(?P<invoice>[0-9]+)$',
+            pretix.presale.views.order.InvoiceDownload.as_view(),
+            name='event.invoice.download'),
 
-    url(r'^ticket/(?P<order>[^/]+)/(?P<position>\d+)/(?P<secret>[A-Za-z0-9]+)/$',
-        pretix.presale.views.order.OrderPositionDetails.as_view(),
-        name='event.order.position'),
-    url(r'^ticket/(?P<order>[^/]+)/(?P<position>\d+)/(?P<secret>[A-Za-z0-9]+)/download/(?P<pid>[0-9]+)/(?P<output>[^/]+)$',
+    re_path(r'^ticket/(?P<order>[^/]+)/(?P<position>\d+)/(?P<secret>[A-Za-z0-9]+)/$',
+            pretix.presale.views.order.OrderPositionDetails.as_view(),
+            name='event.order.position'),
+    re_path(
+        r'^ticket/(?P<order>[^/]+)/(?P<position>\d+)/(?P<secret>[A-Za-z0-9]+)/download/(?P<pid>[0-9]+)/(?P<output>[^/]+)$',
         pretix.presale.views.order.OrderPositionDownload.as_view(),
         name='event.order.position.download'),
 
-    url(r'^ical/?$',
-        pretix.presale.views.event.EventIcalDownload.as_view(),
-        name='event.ical.download'),
-    url(r'^ical/(?P<subevent>[0-9]+)/$',
-        pretix.presale.views.event.EventIcalDownload.as_view(),
-        name='event.ical.download'),
-    url(r'^auth/$', pretix.presale.views.event.EventAuth.as_view(), name='event.auth'),
+    re_path(r'^ical/?$',
+            pretix.presale.views.event.EventIcalDownload.as_view(),
+            name='event.ical.download'),
+    re_path(r'^ical/(?P<subevent>[0-9]+)/$',
+            pretix.presale.views.event.EventIcalDownload.as_view(),
+            name='event.ical.download'),
+    re_path(r'^auth/$', pretix.presale.views.event.EventAuth.as_view(), name='event.auth'),
 
-    url(r'^widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(),
-        name='event.widget.productlist'),
-    url(r'^widget/v1.css$', pretix.presale.views.widget.widget_css, name='event.widget.css'),
-    url(r'^(?P<subevent>\d+)/widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(),
-        name='event.widget.productlist'),
+    re_path(r'^widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(),
+            name='event.widget.productlist'),
+    re_path(r'^widget/v1.css$', pretix.presale.views.widget.widget_css, name='event.widget.css'),
+    re_path(r'^(?P<subevent>\d+)/widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(),
+            name='event.widget.productlist'),
 ]
 
 organizer_patterns = [
-    url(r'^$', pretix.presale.views.organizer.OrganizerIndex.as_view(), name='organizer.index'),
-    url(r'^events/ical/$',
-        pretix.presale.views.organizer.OrganizerIcalDownload.as_view(),
-        name='organizer.ical'),
-    url(r'^widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(),
-        name='organizer.widget.productlist'),
-    url(r'^widget/v1.css$', pretix.presale.views.widget.widget_css, name='organizer.widget.css'),
+    re_path(r'^$', pretix.presale.views.organizer.OrganizerIndex.as_view(), name='organizer.index'),
+    re_path(r'^events/ical/$',
+            pretix.presale.views.organizer.OrganizerIcalDownload.as_view(),
+            name='organizer.ical'),
+    re_path(r'^widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(),
+            name='organizer.widget.productlist'),
+    re_path(r'^widget/v1.css$', pretix.presale.views.widget.widget_css, name='organizer.widget.css'),
 ]
 
 locale_patterns = [
-    url(r'^locale/set$', pretix.presale.views.locale.LocaleSet.as_view(), name='locale.set'),
-    url(r'^robots.txt$', pretix.presale.views.robots.robots_txt, name='robots.txt'),
-    url(r'^browserconfig.xml$', pretix.presale.views.theme.browserconfig_xml, name='browserconfig.xml'),
-    url(r'^site.webmanifest$', pretix.presale.views.theme.webmanifest, name='site.webmanifest'),
-    url(r'^widget/v1\.(?P<lang>[a-zA-Z0-9_\-]+)\.js$', pretix.presale.views.widget.widget_js, name='widget.js'),
+    re_path(r'^locale/set$', pretix.presale.views.locale.LocaleSet.as_view(), name='locale.set'),
+    re_path(r'^robots.txt$', pretix.presale.views.robots.robots_txt, name='robots.txt'),
+    re_path(r'^browserconfig.xml$', pretix.presale.views.theme.browserconfig_xml, name='browserconfig.xml'),
+    re_path(r'^site.webmanifest$', pretix.presale.views.theme.webmanifest, name='site.webmanifest'),
+    re_path(r'^widget/v1\.(?P<lang>[a-zA-Z0-9_\-]+)\.js$', pretix.presale.views.widget.widget_js, name='widget.js'),
 ]

src/pretix/presale/utils.py

@@ -100,7 +100,7 @@ def _detect_event(request, require_live=True, require_plugin=None):
 
         if hasattr(request, 'event'):
             # Restrict locales to the ones available for this event
-            LocaleMiddleware().process_request(request)
+            LocaleMiddleware(NotImplementedError).process_request(request)
 
             if require_live and not request.event.live:
                 can_access = (

src/pretix/settings.py

@@ -81,7 +81,6 @@ else:
 
 if 'mysql' in db_backend:
     db_options['charset'] = 'utf8mb4'
-JSON_FIELD_AVAILABLE = db_backend in ('mysql', 'postgresql')
 
 DATABASES = {
     'default': {

src/pretix/testutils/settings.py

@@ -16,7 +16,7 @@ SITE_URL = "http://example.com"
 
 atexit.register(tmpdir.cleanup)
 
-EMAIL_BACKEND = 'django.core.mail.outbox'
+EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
 
 COMPRESS_ENABLED = COMPRESS_OFFLINE = False
 COMPRESS_CACHE_BACKEND = 'testcache'

src/pretix/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from django.views.generic import RedirectView
 
 import pretix.control.urls
@@ -9,22 +9,22 @@ from pretix.base.views import js_helpers
 from .base.views import cachedfiles, csp, health, js_catalog, metrics, redirect
 
 base_patterns = [
-    url(r'^download/(?P<id>[^/]+)/$', cachedfiles.DownloadView.as_view(),
-        name='cachedfile.download'),
-    url(r'^healthcheck/$', health.healthcheck,
-        name='healthcheck'),
-    url(r'^redirect/$', redirect.redir_view, name='redirect'),
-    url(r'^jsi18n/(?P<lang>[a-zA-Z-_]+)/$', js_catalog.js_catalog, name='javascript-catalog'),
-    url(r'^metrics$', metrics.serve_metrics,
-        name='metrics'),
-    url(r'^csp_report/$', csp.csp_report, name='csp.report'),
-    url(r'^js_helpers/states/$', js_helpers.states, name='js_helpers.states'),
-    url(r'^api/v1/', include(('pretix.api.urls', 'pretixapi'), namespace='api-v1')),
-    url(r'^api/$', RedirectView.as_view(url='/api/v1/'), name='redirect-api-version')
+    re_path(r'^download/(?P<id>[^/]+)/$', cachedfiles.DownloadView.as_view(),
+            name='cachedfile.download'),
+    re_path(r'^healthcheck/$', health.healthcheck,
+            name='healthcheck'),
+    re_path(r'^redirect/$', redirect.redir_view, name='redirect'),
+    re_path(r'^jsi18n/(?P<lang>[a-zA-Z-_]+)/$', js_catalog.js_catalog, name='javascript-catalog'),
+    re_path(r'^metrics$', metrics.serve_metrics,
+            name='metrics'),
+    re_path(r'^csp_report/$', csp.csp_report, name='csp.report'),
+    re_path(r'^js_helpers/states/$', js_helpers.states, name='js_helpers.states'),
+    re_path(r'^api/v1/', include(('pretix.api.urls', 'pretixapi'), namespace='api-v1')),
+    re_path(r'^api/$', RedirectView.as_view(url='/api/v1/'), name='redirect-api-version')
 ]
 
 control_patterns = [
-    url(r'^control/', include((pretix.control.urls, 'control'))),
+    re_path(r'^control/', include((pretix.control.urls, 'control'))),
 ]
 
 debug_patterns = []

src/setup.py

@@ -101,7 +101,7 @@ setup(
         'django-filter==2.4.*',
         'django-scopes==1.2.*',
         'reportlab>=3.5.65',
-        'Pillow==7.*',
+        'Pillow==8.*',
         'PyPDF2==1.26.*',
         'django-libsass==0.8',
         'libsass==0.20.*',

src/tests/base/test_permissions.py

@@ -38,7 +38,7 @@ def admin():
 def admin_request(admin, client):
     factory = RequestFactory()
     r = factory.get('/')
-    SessionMiddleware().process_request(r)
+    SessionMiddleware(NotImplementedError).process_request(r)
     r.session.save()
     admin.staffsession_set.create(date_start=now(), session_key=r.session.session_key)
     admin.staffsession_set.create(date_start=now(), session_key=client.session.session_key)

src/tests/control/test_auth.py

@@ -1,5 +1,5 @@
 import time
-from datetime import date, timedelta
+from datetime import datetime, timedelta
 
 import pytest
 from django.conf import settings
@@ -314,7 +314,7 @@ class Login2FAFormTest(TestCase):
         d = TOTPDevice.objects.create(user=self.user, name='test')
         totp = TOTP(d.bin_key, d.step, d.t0, d.digits, d.drift)
         totp.time = time.time()
-        response = self.client.post('/control/login/2fa'.format(d.pk), {
+        response = self.client.post('/control/login/2fa', {
             'token': str(totp.token() + 2)
         })
         self.assertEqual(response.status_code, 302)
@@ -326,7 +326,7 @@ class Login2FAFormTest(TestCase):
         d = TOTPDevice.objects.create(user=self.user, name='test')
         totp = TOTP(d.bin_key, d.step, d.t0, d.digits, d.drift)
         totp.time = time.time()
-        response = self.client.post('/control/login/2fa?next=/control/events/'.format(d.pk), {
+        response = self.client.post('/control/login/2fa?next=/control/events/', {
             'token': str(totp.token())
         })
         self.assertEqual(response.status_code, 302)
@@ -350,7 +350,7 @@ class Login2FAFormTest(TestCase):
 
         response = self.client.get('/control/login/2fa')
         assert 'token' in response.content.decode()
-        response = self.client.post('/control/login/2fa'.format(d.pk), {
+        response = self.client.post('/control/login/2fa', {
             'token': '{"response": "true"}'
         })
         self.assertEqual(response.status_code, 302)
@@ -372,7 +372,7 @@ class Login2FAFormTest(TestCase):
 
         response = self.client.get('/control/login/2fa')
         assert 'token' in response.content.decode()
-        response = self.client.post('/control/login/2fa'.format(d.pk), {
+        response = self.client.post('/control/login/2fa', {
             'token': '{"response": "true"}'
         })
         self.assertEqual(response.status_code, 302)
@@ -493,8 +493,8 @@ class PasswordRecoveryFormTest(TestCase):
 
     def test_recovery_expired_token(self):
         class Mocked(PasswordResetTokenGenerator):
-            def _today(self):
-                return date.today() - timedelta(settings.PASSWORD_RESET_TIMEOUT_DAYS + 1)
+            def _now(self):
+                return datetime.now() - timedelta(seconds=settings.PASSWORD_RESET_TIMEOUT + 3600)
 
         generator = Mocked()
         token = generator.make_token(self.user)

src/tests/plugins/test_checkinlist.py

@@ -81,8 +81,6 @@ def test_csv_simple(event):
 @pytest.mark.django_db
 def test_csv_order_by_name_parts(event):  # noqa
     from django.conf import settings
-    if not settings.JSON_FIELD_AVAILABLE:
-        raise pytest.skip("Not supported on this database")
     c = CSVCheckinList(event)
     _, _, content = c.render({
         'list': event.checkin_lists.first().pk,
@@ -121,10 +119,6 @@ def test_csv_order_by_name_parts(event):  # noqa
 
 @pytest.mark.django_db
 def test_csv_order_by_inherited_name_parts(event):  # noqa
-    from django.conf import settings
-    if not settings.JSON_FIELD_AVAILABLE:
-        raise pytest.skip("Not supported on this database")
-
     with scope(organizer=event.organizer):
         OrderPosition.objects.filter(attendee_name_cached__icontains="Andrea").delete()
         op = OrderPosition.objects.get()