diff --git a/conservancy/urls.py b/conservancy/urls.py index b11113ed..fd25781f 100644 --- a/conservancy/urls.py +++ b/conservancy/urls.py @@ -17,7 +17,6 @@ # along with this program in a file in the toplevel directory called # "AGPLv3". If not, see . -from django.conf.urls import url from django.urls import include, path, re_path from django.contrib import admin @@ -28,17 +27,17 @@ from . import views as static_views admin.autodiscover() urlpatterns = [ - url(r'^$', frontpage.view), - url(r'^sponsors$', frontpage.view), - url(r'^sponsors/$', sponsors.view), - url(r'^sponsors/index.html$', sponsors.view), - url(r'^admin/', admin.site.urls), - url(r'^feeds/blog/?$', feeds.BlogFeed()), - url(r'^feeds/news/?$', feeds.PressReleaseFeed()), - url(r'^feeds/omnibus/?$', feeds.OmnibusFeed()), - url(r'^feeds/?$', feeds.view), - url(r'^news/', include('conservancy.news.urls')), - url(r'^blog/', include('conservancy.blog.urls')), + path('', frontpage.view), + path('sponsors', frontpage.view), + path('sponsors/', sponsors.view), + path('sponsors/index.html', sponsors.view), + path('admin/', admin.site.urls), + path('feeds/blog/', feeds.BlogFeed()), + path('feeds/news/', feeds.PressReleaseFeed()), + path('feeds/omnibus/', feeds.OmnibusFeed()), + path('feeds/', feeds.view), + path('news/', include('conservancy.news.urls')), + path('blog/', include('conservancy.blog.urls')), # formerly static templated things... (dirs with templates) re_path(r'^about', static_views.index), re_path(r'^activities', static_views.index), @@ -52,9 +51,9 @@ urlpatterns = [ path('contractpatch/', include('conservancy.contractpatch.urls')), re_path(r'^overview', static_views.index), re_path(r'^privacy-policy', static_views.index), - url(r'^sustainer/', include('conservancy.supporter.urls')), + path('sustainer/', include('conservancy.supporter.urls')), re_path(r'^coming-soon.html', static_views.index), - url(r'^fundraiser_data', fundgoal_views.view), + path('fundraiser_data/', fundgoal_views.view), path('assignment/', include('conservancy.assignment.urls')), re_path(r'^fossy/$', static_views.index), path('fossy/', include('conservancy.fossy.urls')),