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

Added deprecation warning for old-style urlconfigs in plugins

Browse Source
This commit is contained in:
Raphael Michel
2016-08-03 09:43:24 +02:00
parent 01fff14152
commit 8dcb8193fa
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
import importlib.util import importlib.util
import warnings
from django.apps import apps from django.apps import apps
from django.conf.urls import include, url from django.conf.urls import include, url
@@ -31,6 +32,9 @@ for app in apps.get_app_configs():
url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(urlmod.event_patterns, namespace=app.label)) url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(urlmod.event_patterns, namespace=app.label))
) )
elif importlib.util.find_spec(app.name + '.maindomain_urls'): elif importlib.util.find_spec(app.name + '.maindomain_urls'):
warnings.warn('Please put your config in an \'urls\' module using the urlpatterns and event_patterns '
'attribute. Support for maindomain_urls in plugins will be dropped in the future.',
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, namespace=app.label))

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

@@ -1,9 +1,8 @@
import importlib
import importlib.util import importlib.util
import warnings
from django.apps import apps from django.apps import apps
from django.conf.urls import include, url from django.conf.urls import include, url
from pretix.presale.urls import ( from pretix.presale.urls import (
event_patterns, locale_patterns, organizer_patterns, event_patterns, locale_patterns, organizer_patterns,
) )
@@ -26,6 +25,9 @@ for app in apps.get_app_configs():
url(r'^(?P<event>[^/]+)/', include(urlmod.event_patterns, namespace=app.label)) url(r'^(?P<event>[^/]+)/', include(urlmod.event_patterns, namespace=app.label))
) )
elif importlib.util.find_spec(app.name + '.subdomain_urls'): elif importlib.util.find_spec(app.name + '.subdomain_urls'):
warnings.warn('Please put your config in an \'urls\' module using the event_patterns '
'attribute. Support for subdomain_urls in plugins will be dropped in the future.',
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, namespace=app.label))