Upgrade to Django 3.2 (#2056)

This commit is contained in:
Raphael Michel
2021-05-07 12:00:30 +02:00
committed by GitHub
parent 0a7a3537eb
commit 403b8191e4
120 changed files with 1994 additions and 1555 deletions

View File

@@ -22,15 +22,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')))
]
@@ -42,11 +42,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