CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Django 1.10: URL configuration deprecations

Browse Source
This commit is contained in:
Raphael Michel
2016-09-27 10:21:54 +02:00
parent 965428e422
commit fbd1c0d367
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/multidomain/maindomain_urlconf.py
View File

@@ -11,11 +11,11 @@ from pretix.presale.urls import (
from pretix.urls import common_patterns from pretix.urls import common_patterns
presale_patterns_main = [ presale_patterns_main = [
url(r'', include(locale_patterns + [ url(r'', include((locale_patterns + [
url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(event_patterns)), url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(event_patterns)),
url(r'^(?P<organizer>[^/]+)/', include(organizer_patterns)), url(r'^(?P<organizer>[^/]+)/', include(organizer_patterns)),
url(r'^$', TemplateView.as_view(template_name='pretixpresale/index.html')) url(r'^$', TemplateView.as_view(template_name='pretixpresale/index.html'))
], namespace='presale')) ], 'presale')))
] ]
raw_plugin_patterns = [] raw_plugin_patterns = []
@@ -30,7 +30,7 @@ for app in apps.get_app_configs():
single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
include(urlmod.event_patterns))) include(urlmod.event_patterns)))
raw_plugin_patterns.append( raw_plugin_patterns.append(
url(r'', include(single_plugin_patterns, namespace=app.label)) url(r'', include((single_plugin_patterns, app.label)))
) )
elif importlib.util.find_spec(app.name + '.maindomain_urls'): # noqa elif importlib.util.find_spec(app.name + '.maindomain_urls'): # noqa
warnings.warn('Please put your config in an \'urls\' module using the urlpatterns and event_patterns ' warnings.warn('Please put your config in an \'urls\' module using the urlpatterns and event_patterns '
@@ -38,11 +38,11 @@ for app in apps.get_app_configs():
DeprecationWarning) DeprecationWarning)
urlmod = importlib.import_module(app.name + '.maindomain_urls') urlmod = importlib.import_module(app.name + '.maindomain_urls')
raw_plugin_patterns.append( raw_plugin_patterns.append(
url(r'', include(urlmod, namespace=app.label)) url(r'', include((urlmod, app.label)))
) )
plugin_patterns = [ plugin_patterns = [
url(r'', include(raw_plugin_patterns, namespace='plugins')) url(r'', include((raw_plugin_patterns, 'plugins')))
] ]
# The presale namespace comes last, because it contains a wildcard catch # The presale namespace comes last, because it contains a wildcard catch

10
src/pretix/multidomain/subdomain_urlconf.py
View File

@@ -10,10 +10,10 @@ from pretix.presale.urls import (
from pretix.urls import common_patterns from pretix.urls import common_patterns
presale_patterns = [ presale_patterns = [
url(r'', include(locale_patterns + [ url(r'', include((locale_patterns + [
url(r'^(?P<event>[^/]+)/', include(event_patterns)), url(r'^(?P<event>[^/]+)/', include(event_patterns)),
url(r'', include(organizer_patterns)) url(r'', include(organizer_patterns))
], namespace='presale')) ], 'presale')))
] ]
raw_plugin_patterns = [] raw_plugin_patterns = []
@@ -23,7 +23,7 @@ for app in apps.get_app_configs():
urlmod = importlib.import_module(app.name + '.urls') urlmod = importlib.import_module(app.name + '.urls')
if hasattr(urlmod, 'event_patterns'): if hasattr(urlmod, 'event_patterns'):
raw_plugin_patterns.append( raw_plugin_patterns.append(
url(r'^(?P<event>[^/]+)/', include(urlmod.event_patterns, namespace=app.label)) url(r'^(?P<event>[^/]+)/', include((urlmod.event_patterns, app.label)))
) )
elif importlib.util.find_spec(app.name + '.subdomain_urls'): # noqa elif importlib.util.find_spec(app.name + '.subdomain_urls'): # noqa
warnings.warn('Please put your config in an \'urls\' module using the event_patterns ' warnings.warn('Please put your config in an \'urls\' module using the event_patterns '
@@ -31,11 +31,11 @@ for app in apps.get_app_configs():
DeprecationWarning) DeprecationWarning)
urlmod = importlib.import_module(app.name + '.subdomain_urls') urlmod = importlib.import_module(app.name + '.subdomain_urls')
raw_plugin_patterns.append( raw_plugin_patterns.append(
url(r'', include(urlmod, namespace=app.label)) url(r'', include((urlmod, app.label)))
) )
plugin_patterns = [ plugin_patterns = [
url(r'', include(raw_plugin_patterns, namespace='plugins')) url(r'', include((raw_plugin_patterns, 'plugins')))
] ]
# The presale namespace comes last, because it contains a wildcard catch # The presale namespace comes last, because it contains a wildcard catch

2
src/pretix/urls.py
View File

@@ -16,7 +16,7 @@ base_patterns = [
] ]
control_patterns = [ control_patterns = [
url(r'^control/', include(pretix.control.urls, namespace='control')), url(r'^control/', include((pretix.control.urls, 'control'))),
] ]
debug_patterns = [] debug_patterns = []