From fbd1c0d367175fd89df8ece1b9d48163e844af0e Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 27 Sep 2016 10:21:54 +0200
Subject: [PATCH] Django 1.10: URL configuration deprecations

---
 src/pretix/multidomain/maindomain_urlconf.py | 10 +++++-----
 src/pretix/multidomain/subdomain_urlconf.py  | 10 +++++-----
 src/pretix/urls.py                           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pretix/multidomain/maindomain_urlconf.py b/src/pretix/multidomain/maindomain_urlconf.py
index 24a73a898d..e37ca299bb 100644
--- a/src/pretix/multidomain/maindomain_urlconf.py
+++ b/src/pretix/multidomain/maindomain_urlconf.py
@@ -11,11 +11,11 @@ from pretix.presale.urls import (
 from pretix.urls import common_patterns
 
 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>[^/]+)/', include(organizer_patterns)),
         url(r'^$', TemplateView.as_view(template_name='pretixpresale/index.html'))
-    ], namespace='presale'))
+    ], 'presale')))
 ]
 
 raw_plugin_patterns = []
@@ -30,7 +30,7 @@ for app in apps.get_app_configs():
                 single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
                                                   include(urlmod.event_patterns)))
             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
             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)
             urlmod = importlib.import_module(app.name + '.maindomain_urls')
             raw_plugin_patterns.append(
-                url(r'', include(urlmod, namespace=app.label))
+                url(r'', include((urlmod, app.label)))
             )
 
 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
diff --git a/src/pretix/multidomain/subdomain_urlconf.py b/src/pretix/multidomain/subdomain_urlconf.py
index 52e082a35e..6810ac0d81 100644
--- a/src/pretix/multidomain/subdomain_urlconf.py
+++ b/src/pretix/multidomain/subdomain_urlconf.py
@@ -10,10 +10,10 @@ from pretix.presale.urls import (
 from pretix.urls import common_patterns
 
 presale_patterns = [
-    url(r'', include(locale_patterns + [
+    url(r'', include((locale_patterns + [
         url(r'^(?P<event>[^/]+)/', include(event_patterns)),
         url(r'', include(organizer_patterns))
-    ], namespace='presale'))
+    ], 'presale')))
 ]
 
 raw_plugin_patterns = []
@@ -23,7 +23,7 @@ for app in apps.get_app_configs():
             urlmod = importlib.import_module(app.name + '.urls')
             if hasattr(urlmod, 'event_patterns'):
                 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
             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)
             urlmod = importlib.import_module(app.name + '.subdomain_urls')
             raw_plugin_patterns.append(
-                url(r'', include(urlmod, namespace=app.label))
+                url(r'', include((urlmod, app.label)))
             )
 
 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
diff --git a/src/pretix/urls.py b/src/pretix/urls.py
index c72f3fd1fb..1a7416c704 100644
--- a/src/pretix/urls.py
+++ b/src/pretix/urls.py
@@ -16,7 +16,7 @@ base_patterns = [
 ]
 
 control_patterns = [
-    url(r'^control/', include(pretix.control.urls, namespace='control')),
+    url(r'^control/', include((pretix.control.urls, 'control'))),
 ]
 
 debug_patterns = []