Be explicit about subdomain_ and maindomain_ urls in plugins

src/pretix/plugins/paypal/maindomain_urls.py

@@ -3,7 +3,7 @@ from django.conf.urls import include, url
 from .views import abort, success
 
 urlpatterns = [
-    url(r'^(?:(?P<organizer>[^/]+)/)?(?P<event>[^/]+)/paypal/', include([
+    url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/paypal/', include([
         url(r'^abort/$', abort, name='abort'),
         url(r'^return/$', success, name='return'),
     ])),

src/pretix/plugins/paypal/subdomain_urls.py

@@ -0,0 +1,10 @@
+from django.conf.urls import include, url
+
+from .views import abort, success
+
+urlpatterns = [
+    url(r'^(?P<event>[^/]+)/paypal/', include([
+        url(r'^abort/$', abort, name='abort'),
+        url(r'^return/$', success, name='return'),
+    ])),
+]

src/pretix/urls.py

@@ -1,7 +1,3 @@
-import importlib
-import importlib.util
-
-from django.apps import apps
 from django.conf import settings
 from django.conf.urls import include, url
 
@@ -27,17 +23,4 @@ if settings.DEBUG:
 
     debug_patterns.append(url(r'^__debug__/', include(debug_toolbar.urls)))
 
-raw_plugin_patterns = []
-for app in apps.get_app_configs():
-    if hasattr(app, 'PretixPluginMeta'):
-        if importlib.util.find_spec(app.name + '.urls'):
-            urlmod = importlib.import_module(app.name + '.urls')
-            raw_plugin_patterns.append(
-                url(r'', include(urlmod, namespace=app.label))
-            )
-
-plugin_patterns = [
-    url(r'', include(raw_plugin_patterns, namespace='plugins'))
-]
-
-common_patterns = base_patterns + control_patterns + debug_patterns + plugin_patterns
+common_patterns = base_patterns + control_patterns + debug_patterns