From 352fc99b623b5ad83daffa5f200557fa29f85951 Mon Sep 17 00:00:00 2001 From: saschalalala Date: Sun, 6 May 2018 14:53:56 +0200 Subject: [PATCH] Change config urls to Django 2 paths --- {{cookiecutter.project_slug}}/config/urls.py | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py index 2a126f6ea..78e127d1a 100644 --- a/{{cookiecutter.project_slug}}/config/urls.py +++ b/{{cookiecutter.project_slug}}/config/urls.py @@ -1,25 +1,25 @@ from django.conf import settings -from django.conf.urls import include, url +from django.urls import include, path from django.conf.urls.static import static from django.contrib import admin from django.views.generic import TemplateView from django.views import defaults as default_views urlpatterns = [ - url(r"^$", TemplateView.as_view(template_name="pages/home.html"), name="home"), - url( - r"^about/$", + path("", TemplateView.as_view(template_name="pages/home.html"), name="home"), + path( + "about/", TemplateView.as_view(template_name="pages/about.html"), name="about", ), # Django Admin, use {% raw %}{% url 'admin:index' %}{% endraw %} - url(settings.ADMIN_URL, admin.site.urls), + path(settings.ADMIN_URL, admin.site.urls), # User management - url( - r"^users/", + path( + "users/", include("{{ cookiecutter.project_slug }}.users.urls", namespace="users"), ), - url(r"^accounts/", include("allauth.urls")), + path("accounts/", include("allauth.urls")), # Your stuff: custom urls includes go here ] + static( settings.MEDIA_URL, document_root=settings.MEDIA_ROOT @@ -29,24 +29,24 @@ if settings.DEBUG: # This allows the error pages to be debugged during development, just visit # these url in browser to see how these error pages look like. urlpatterns += [ - url( - r"^400/$", + path( + "400/", default_views.bad_request, kwargs={"exception": Exception("Bad Request!")}, ), - url( - r"^403/$", + path( + r"403/", default_views.permission_denied, kwargs={"exception": Exception("Permission Denied")}, ), - url( - r"^404/$", + path( + "404/", default_views.page_not_found, kwargs={"exception": Exception("Page not Found")}, ), - url(r"^500/$", default_views.server_error), + path("500/", default_views.server_error), ] if "debug_toolbar" in settings.INSTALLED_APPS: import debug_toolbar - urlpatterns = [url(r"^__debug__/", include(debug_toolbar.urls))] + urlpatterns + urlpatterns = [path("__debug__/", include(debug_toolbar.urls))] + urlpatterns