diff --git a/conservancy/podjango/urls.py b/conservancy/podjango/urls.py index 1fab03912cd286db62dc1e23b5e00d4921ad6173..0d6896a399a27fdf3988e05c32ac9b0138a924f9 100644 --- a/conservancy/podjango/urls.py +++ b/conservancy/podjango/urls.py @@ -20,7 +20,7 @@ import datetime from django.conf import settings -from django.conf.urls import url +from django.urls import path from django.views.generic.dates import ( DateDetailView, DayArchiveView, @@ -44,16 +44,16 @@ info_dict = { } urlpatterns = [ - url(r'^$', frontpage.view, name='cast-home'), - url(r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', DateDetailView.as_view(**info_dict), name='detail'), - url(r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', DayArchiveView.as_view(**info_dict), name='day-archive'), - url(r'^(?P\d{4})/(?P[a-z]{3})/$', MonthArchiveView.as_view(**info_dict), name='month-archive'), - url(r'^(?P\d{4})/$', YearArchiveView.as_view(**info_dict), name='year-archive'), - url(r'^all/$', custom_index, dict(info_dict, paginate_by=20), name='cast'), - url(r'^query/$', query, name='query'), - url(r'^feeds/ogg/$', OggCastFeed(), name='feed-ogg'), - url(r'^feeds/mp3/$', Mp3CastFeed(), name='feed-mp3'), - url(r'^feeds/$', view, name='feeds'), + path('', frontpage.view, name='cast-home'), + path('////', DateDetailView.as_view(**info_dict), name='detail'), + path('///', DayArchiveView.as_view(**info_dict), name='day-archive'), + path('//', MonthArchiveView.as_view(**info_dict), name='month-archive'), + path('/', YearArchiveView.as_view(**info_dict), name='year-archive'), + path('all/', custom_index, dict(info_dict, paginate_by=20), name='cast'), + path('query/', query, name='query'), + path('feeds/ogg/', OggCastFeed(), name='feed-ogg'), + path('feeds/mp3/', Mp3CastFeed(), name='feed-mp3'), + path('feeds/', view, name='feeds'), ] if settings.DEBUG: