From 1fbb1352d913136f7dec740656eeabfbf8d3e35d Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sun, 31 Jul 2016 13:06:06 +0200 Subject: [PATCH] Moved core plugins to the new URL API --- .../banktransfer/{maindomain_urls.py => urls.py} | 0 src/pretix/plugins/paypal/maindomain_urls.py | 10 ---------- .../plugins/paypal/{subdomain_urls.py => urls.py} | 4 ++-- .../pretixdroid/{maindomain_urls.py => urls.py} | 0 .../plugins/sendmail/{maindomain_urls.py => urls.py} | 0 .../plugins/statistics/{maindomain_urls.py => urls.py} | 0 .../plugins/stripe/{maindomain_urls.py => urls.py} | 0 7 files changed, 2 insertions(+), 12 deletions(-) rename src/pretix/plugins/banktransfer/{maindomain_urls.py => urls.py} (100%) delete mode 100644 src/pretix/plugins/paypal/maindomain_urls.py rename src/pretix/plugins/paypal/{subdomain_urls.py => urls.py} (74%) rename src/pretix/plugins/pretixdroid/{maindomain_urls.py => urls.py} (100%) rename src/pretix/plugins/sendmail/{maindomain_urls.py => urls.py} (100%) rename src/pretix/plugins/statistics/{maindomain_urls.py => urls.py} (100%) rename src/pretix/plugins/stripe/{maindomain_urls.py => urls.py} (100%) diff --git a/src/pretix/plugins/banktransfer/maindomain_urls.py b/src/pretix/plugins/banktransfer/urls.py similarity index 100% rename from src/pretix/plugins/banktransfer/maindomain_urls.py rename to src/pretix/plugins/banktransfer/urls.py diff --git a/src/pretix/plugins/paypal/maindomain_urls.py b/src/pretix/plugins/paypal/maindomain_urls.py deleted file mode 100644 index 753d78874..000000000 --- a/src/pretix/plugins/paypal/maindomain_urls.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.conf.urls import include, url - -from .views import abort, success - -urlpatterns = [ - url(r'^(?P[^/]+)/(?P[^/]+)/paypal/', include([ - url(r'^abort/$', abort, name='abort'), - url(r'^return/$', success, name='return'), - ])), -] diff --git a/src/pretix/plugins/paypal/subdomain_urls.py b/src/pretix/plugins/paypal/urls.py similarity index 74% rename from src/pretix/plugins/paypal/subdomain_urls.py rename to src/pretix/plugins/paypal/urls.py index 1f41a1e1c..00ee78ac9 100644 --- a/src/pretix/plugins/paypal/subdomain_urls.py +++ b/src/pretix/plugins/paypal/urls.py @@ -2,8 +2,8 @@ from django.conf.urls import include, url from .views import abort, success -urlpatterns = [ - url(r'^(?P[^/]+)/paypal/', include([ +event_patterns = [ + url(r'^paypal/', include([ url(r'^abort/$', abort, name='abort'), url(r'^return/$', success, name='return'), ])), diff --git a/src/pretix/plugins/pretixdroid/maindomain_urls.py b/src/pretix/plugins/pretixdroid/urls.py similarity index 100% rename from src/pretix/plugins/pretixdroid/maindomain_urls.py rename to src/pretix/plugins/pretixdroid/urls.py diff --git a/src/pretix/plugins/sendmail/maindomain_urls.py b/src/pretix/plugins/sendmail/urls.py similarity index 100% rename from src/pretix/plugins/sendmail/maindomain_urls.py rename to src/pretix/plugins/sendmail/urls.py diff --git a/src/pretix/plugins/statistics/maindomain_urls.py b/src/pretix/plugins/statistics/urls.py similarity index 100% rename from src/pretix/plugins/statistics/maindomain_urls.py rename to src/pretix/plugins/statistics/urls.py diff --git a/src/pretix/plugins/stripe/maindomain_urls.py b/src/pretix/plugins/stripe/urls.py similarity index 100% rename from src/pretix/plugins/stripe/maindomain_urls.py rename to src/pretix/plugins/stripe/urls.py