diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 034a1dfb8a968ed2640cd5782f37413c657d66c8..4818128bda012ed37b15cf9cd44b88ec8beeb24f 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -1,8 +1,9 @@ +import debug_toolbar from django.conf import settings -from django.conf.urls import include, url from django.conf.urls.static import static from django.views.generic import RedirectView from django.views.generic import TemplateView +from django.urls import include, path from django.contrib.flatpages.views import flatpage from django.contrib import admin @@ -11,31 +12,30 @@ import symposion.views urlpatterns = [ - url(r'^saml2/', include('djangosaml2.urls')), - url(r"^admin/", include(admin.site.urls)), + path('saml2/', include('djangosaml2.urls')), + path('admin/', admin.site.urls), - url(r"^speaker/", include("symposion.speakers.urls")), - url(r"^proposals/", include("symposion.proposals.urls")), - url(r"^reviews/", include("symposion.reviews.urls")), - url(r"^schedule/", include("symposion.schedule.urls")), - url(r"^conference/", include("symposion.conference.urls")), + path("speaker/", include("symposion.speakers.urls")), + path("proposals/", include("symposion.proposals.urls")), + path("reviews/", include("symposion.reviews.urls")), + path("schedule/", include("symposion.schedule.urls")), + path("conference/", include("symposion.conference.urls")), - url(r"^teams/", include("symposion.teams.urls")), - url(r'^raffle/', include("pinaxcon.raffle.urls")), + path("teams/", include("symposion.teams.urls")), + path('raffle/', include("pinaxcon.raffle.urls")), # Required by registrasion - url(r'^tickets/payments/', include('registripe.urls')), - url(r'^tickets/', include('registrasion.urls')), - url(r'^nested_admin/', include('nested_admin.urls')), - url(r'^checkin/', include('regidesk.urls')), - url(r'^pages/', include('django.contrib.flatpages.urls')), - - url(r'^dashboard/', symposion.views.dashboard, name="dashboard"), - url(r'^boardingpass', RedirectView.as_view(pattern_name="regidesk:boardingpass")), -] + path('tickets/payments/', include('registripe.urls')), + path('tickets/', include('registrasion.urls')), + path('nested_admin/', include('nested_admin.urls')), + path('checkin/', include('regidesk.urls')), + path('pages/', include('django.contrib.flatpages.urls')), + + path('dashboard/', symposion.views.dashboard, name="dashboard"), + path('boardingpass', RedirectView.as_view(pattern_name="regidesk:boardingpass")), -if settings.DEBUG: - import debug_toolbar - urlpatterns.insert(0, url(r'^__debug__/', include(debug_toolbar.urls))) + # Debug Toolbar. Always include to ensure tests work. + path('__debug__/', include(debug_toolbar.urls)), +] -urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)# \ No newline at end of file +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)