From 97f5e4a2f1899f9238ef20ce5d261961563b870e Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 13 Mar 2015 00:03:27 +0100 Subject: [PATCH] Migrate to Django 1.8-style URLconfigs See https://docs.djangoproject.com/en/dev/releases/1.8/#django-conf-urls-patterns and #14 --- src/pretix/control/urls.py | 105 +++++++++++++++++-------------------- src/pretix/presale/urls.py | 40 +++++++------- src/pretix/urls.py | 10 ++-- 3 files changed, 71 insertions(+), 84 deletions(-) diff --git a/src/pretix/control/urls.py b/src/pretix/control/urls.py index a260a89f5..298c9a7a9 100644 --- a/src/pretix/control/urls.py +++ b/src/pretix/control/urls.py @@ -1,59 +1,50 @@ -from django.conf.urls import patterns, url, include -from pretix.control.views import main, event, item +from django.conf.urls import url, include -urlpatterns = patterns('',) -urlpatterns += patterns( - 'pretix.control.views.auth', - url(r'^logout$', 'logout', name='auth.logout'), - url(r'^login$', 'login', name='auth.login'), -) -urlpatterns += patterns( - 'pretix.control.views.main', - url(r'^$', 'index', name='index'), + +from pretix.control.views import main, event, item, auth + +urlpatterns = [ + url(r'^logout$', auth.logout, name='auth.logout'), + url(r'^login$', auth.login, name='auth.login'), + url(r'^$', main.index, name='index'), url(r'^events/$', main.EventList.as_view(), name='events'), -) -urlpatterns += patterns( - 'pretix.control.views.event', - url(r'^event/(?P[^/]+)/(?P[^/]+)/', include( - patterns( - 'pretix.control.views', - url(r'^$', 'event.index', name='event.index'), - url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'), - url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'), - url(r'^settings/payment$', event.PaymentSettings.as_view(), name='event.settings.payment'), - url(r'^items/$', item.ItemList.as_view(), name='event.items'), - url(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'), - url(r'^items/(?P[0-9a-f-]+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'), - url(r'^items/(?P[0-9a-f-]+)/variations$', item.ItemVariations.as_view(), - name='event.item.variations'), - url(r'^items/(?P[0-9a-f-]+)/restrictions$', item.ItemRestrictions.as_view(), - name='event.item.restrictions'), - url(r'^categories/$', item.CategoryList.as_view(), name='event.items.categories'), - url(r'^categories/(?P[0-9a-f-]+)/delete$', item.CategoryDelete.as_view(), - name='event.items.categories.delete'), - url(r'^categories/(?P[0-9a-f-]+)/up$', item.category_move_up, name='event.items.categories.up'), - url(r'^categories/(?P[0-9a-f-]+)/down$', item.category_move_down, - name='event.items.categories.down'), - url(r'^categories/(?P[0-9a-f-]+)/$', item.CategoryUpdate.as_view(), - name='event.items.categories.edit'), - url(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'), - url(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'), - url(r'^questions/(?P[0-9a-f-]+)/delete$', item.QuestionDelete.as_view(), - name='event.items.questions.delete'), - url(r'^questions/(?P[0-9a-f-]+)/$', item.QuestionUpdate.as_view(), - name='event.items.questions.edit'), - url(r'^questions/add$', item.QuestionCreate.as_view(), name='event.items.questions.add'), - url(r'^properties/$', item.PropertyList.as_view(), name='event.items.properties'), - url(r'^properties/(?P[0-9a-f-]+)/$', item.PropertyUpdate.as_view(), - name='event.items.properties.edit'), - url(r'^properties/(?P[0-9a-f-]+)/delete$', item.PropertyDelete.as_view(), - name='event.items.properties.delete'), - url(r'^properties/add$', item.PropertyCreate.as_view(), name='event.items.properties.add'), - url(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'), - url(r'^quotas/(?P[0-9a-f-]+)/$', item.QuotaUpdate.as_view(), name='event.items.quotas.edit'), - url(r'^quotas/(?P[0-9a-f-]+)/delete$', item.QuotaDelete.as_view(), - name='event.items.quotas.delete'), - url(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'), - ) - )) -) + url(r'^event/(?P[^/]+)/(?P[^/]+)/', include([ + url(r'^$', event.index, name='event.index'), + url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'), + url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'), + url(r'^settings/payment$', event.PaymentSettings.as_view(), name='event.settings.payment'), + url(r'^items/$', item.ItemList.as_view(), name='event.items'), + url(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'), + url(r'^items/(?P[0-9a-f-]+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'), + url(r'^items/(?P[0-9a-f-]+)/variations$', item.ItemVariations.as_view(), + name='event.item.variations'), + url(r'^items/(?P[0-9a-f-]+)/restrictions$', item.ItemRestrictions.as_view(), + name='event.item.restrictions'), + url(r'^categories/$', item.CategoryList.as_view(), name='event.items.categories'), + url(r'^categories/(?P[0-9a-f-]+)/delete$', item.CategoryDelete.as_view(), + name='event.items.categories.delete'), + url(r'^categories/(?P[0-9a-f-]+)/up$', item.category_move_up, name='event.items.categories.up'), + url(r'^categories/(?P[0-9a-f-]+)/down$', item.category_move_down, + name='event.items.categories.down'), + url(r'^categories/(?P[0-9a-f-]+)/$', item.CategoryUpdate.as_view(), + name='event.items.categories.edit'), + url(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'), + url(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'), + url(r'^questions/(?P[0-9a-f-]+)/delete$', item.QuestionDelete.as_view(), + name='event.items.questions.delete'), + url(r'^questions/(?P[0-9a-f-]+)/$', item.QuestionUpdate.as_view(), + name='event.items.questions.edit'), + url(r'^questions/add$', item.QuestionCreate.as_view(), name='event.items.questions.add'), + url(r'^properties/$', item.PropertyList.as_view(), name='event.items.properties'), + url(r'^properties/(?P[0-9a-f-]+)/$', item.PropertyUpdate.as_view(), + name='event.items.properties.edit'), + url(r'^properties/(?P[0-9a-f-]+)/delete$', item.PropertyDelete.as_view(), + name='event.items.properties.delete'), + url(r'^properties/add$', item.PropertyCreate.as_view(), name='event.items.properties.add'), + url(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'), + url(r'^quotas/(?P[0-9a-f-]+)/$', item.QuotaUpdate.as_view(), name='event.items.quotas.edit'), + url(r'^quotas/(?P[0-9a-f-]+)/delete$', item.QuotaDelete.as_view(), + name='event.items.quotas.delete'), + url(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'), + ])), +] diff --git a/src/pretix/presale/urls.py b/src/pretix/presale/urls.py index c1d29d777..228344c40 100644 --- a/src/pretix/presale/urls.py +++ b/src/pretix/presale/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include import pretix.presale.views.event import pretix.presale.views.cart @@ -6,24 +6,20 @@ import pretix.presale.views.checkout import pretix.presale.views.order -urlpatterns = patterns( - '', - url(r'^(?P[^/]+)/(?P[^/]+)/', include( - patterns( - 'pretix.presale.views.event', - url(r'^$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'), - url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'), - url(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'), - url(r'^checkout$', pretix.presale.views.checkout.CheckoutStart.as_view(), name='event.checkout.start'), - url(r'^checkout/payment$', pretix.presale.views.checkout.PaymentDetails.as_view(), - name='event.checkout.payment'), - url(r'^checkout/confirm$', pretix.presale.views.checkout.OrderConfirm.as_view(), - name='event.checkout.confirm'), - url(r'^order/(?P[^/]+)/$', pretix.presale.views.order.OrderDetails.as_view(), - name='event.order'), - url(r'^order/(?P[^/]+)/cancel$', pretix.presale.views.order.OrderCancel.as_view(), - name='event.order.cancel'), - url(r'^login$', pretix.presale.views.event.EventLogin.as_view(), name='event.checkout.login'), - ) - )), -) +urlpatterns = [ + url(r'^(?P[^/]+)/(?P[^/]+)/', include([ + url(r'^$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'), + url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'), + url(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'), + url(r'^checkout$', pretix.presale.views.checkout.CheckoutStart.as_view(), name='event.checkout.start'), + url(r'^checkout/payment$', pretix.presale.views.checkout.PaymentDetails.as_view(), + name='event.checkout.payment'), + url(r'^checkout/confirm$', pretix.presale.views.checkout.OrderConfirm.as_view(), + name='event.checkout.confirm'), + url(r'^order/(?P[^/]+)/$', pretix.presale.views.order.OrderDetails.as_view(), + name='event.order'), + url(r'^order/(?P[^/]+)/cancel$', pretix.presale.views.order.OrderCancel.as_view(), + name='event.order.cancel'), + url(r'^login$', pretix.presale.views.event.EventLogin.as_view(), name='event.checkout.login'), + ])), +] diff --git a/src/pretix/urls.py b/src/pretix/urls.py index 5a67db51d..25acb7912 100644 --- a/src/pretix/urls.py +++ b/src/pretix/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.contrib import admin from django.conf import settings @@ -6,19 +6,19 @@ import pretix.control.urls import pretix.presale.urls -urlpatterns = patterns('', +urlpatterns = [ url(r'^control/', include(pretix.control.urls, namespace='control')), url(r'^admin/', include(admin.site.urls)), # The pretixpresale namespace is configured at the bottom of this file, because it # contains a wildcard-style URL which has to be configured _after_ debug settings. -) +] if settings.DEBUG: import debug_toolbar - urlpatterns += patterns('', + urlpatterns.append( url(r'^__debug__/', include(debug_toolbar.urls)), ) -urlpatterns += patterns('', +urlpatterns.append( url(r'', include(pretix.presale.urls, namespace='presale')) )