klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-10 03:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

django2.2: migrate url to re_path

Browse Source
This commit is contained in:
Antoine Bartuccio
2019-10-05 18:14:41 +02:00
parent 7be9077fce
commit be855c6c90
19 changed files with 387 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
sith/urls.py
View File

@ -37,9 +37,9 @@ Including another URLconf
1. Add an import: from blog import urls as blog_urls
2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls))
"""
from django.conf.urls import include, url
from django.urls import include, re_path
from django.contrib import admin
from django.conf.urls.static import static
from django.urls.static import static
from django.conf import settings
from django.views.i18n import javascript_catalog
from ajax_select import urls as ajax_select_urls
@ -51,48 +51,61 @@ handler404 = "core.views.not_found"
handler500 = "core.views.internal_servor_error"
urlpatterns = [
url(r"^", include("core.urls", namespace="core", app_name="core")),
url(
re_path(r"^", include("core.re_paths", namespace="core", app_name="core")),
re_path(
r"^rootplace/",
include("rootplace.urls", namespace="rootplace", app_name="rootplace"),
include("rootplace.re_paths", namespace="rootplace", app_name="rootplace"),
),
url(
re_path(
r"^subscription/",
include("subscription.urls", namespace="subscription", app_name="subscription"),
include(
"subscription.re_paths", namespace="subscription", app_name="subscription"
),
),
url(r"^com/", include("com.urls", namespace="com", app_name="com")),
url(r"^club/", include("club.urls", namespace="club", app_name="club")),
url(r"^counter/", include("counter.urls", namespace="counter", app_name="counter")),
url(r"^stock/", include("stock.urls", namespace="stock", app_name="stock")),
url(
re_path(r"^com/", include("com.re_paths", namespace="com", app_name="com")),
re_path(r"^club/", include("club.re_paths", namespace="club", app_name="club")),
re_path(
r"^counter/",
include("counter.re_paths", namespace="counter", app_name="counter"),
),
re_path(r"^stock/", include("stock.re_paths", namespace="stock", app_name="stock")),
re_path(
r"^accounting/",
include("accounting.urls", namespace="accounting", app_name="accounting"),
include("accounting.re_paths", namespace="accounting", app_name="accounting"),
),
url(r"^eboutic/", include("eboutic.urls", namespace="eboutic", app_name="eboutic")),
url(
re_path(
r"^eboutic/",
include("eboutic.re_paths", namespace="eboutic", app_name="eboutic"),
),
re_path(
r"^launderette/",
include("launderette.urls", namespace="launderette", app_name="launderette"),
include(
"launderette.re_paths", namespace="launderette", app_name="launderette"
),
),
url(r"^sas/", include("sas.urls", namespace="sas", app_name="sas")),
url(r"^api/v1/", include("api.urls", namespace="api", app_name="api")),
url(
re_path(r"^sas/", include("sas.re_paths", namespace="sas", app_name="sas")),
re_path(r"^api/v1/", include("api.re_paths", namespace="api", app_name="api")),
re_path(
r"^election/",
include("election.urls", namespace="election", app_name="election"),
include("election.re_paths", namespace="election", app_name="election"),
),
url(r"^forum/", include("forum.urls", namespace="forum", app_name="forum")),
url(r"^trombi/", include("trombi.urls", namespace="trombi", app_name="trombi")),
url(
r"^matmatronch/", include("matmat.urls", namespace="matmat", app_name="matmat")
re_path(r"^forum/", include("forum.re_paths", namespace="forum", app_name="forum")),
re_path(
r"^trombi/", include("trombi.re_paths", namespace="trombi", app_name="trombi")
),
url(
re_path(
r"^matmatronch/",
include("matmat.re_paths", namespace="matmat", app_name="matmat"),
),
re_path(
r"^pedagogy/",
include("pedagogy.urls", namespace="pedagogy", app_name="pedagogy"),
include("pedagogy.re_paths", namespace="pedagogy", app_name="pedagogy"),
),
url(r"^admin/", include(admin.site.urls)),
url(r"^ajax_select/", include(ajax_select_urls)),
url(r"^i18n/", include("django.conf.urls.i18n")),
url(r"^jsi18n/$", javascript_catalog, js_info_dict, name="javascript-catalog"),
url(r"^captcha/", include("captcha.urls")),
re_path(r"^admin/", include(admin.site.re_paths)),
re_path(r"^ajax_select/", include(ajax_select_re_paths)),
re_path(r"^i18n/", include("django.urls.i18n")),
re_path(r"^jsi18n/$", javascript_catalog, js_info_dict, name="javascript-catalog"),
re_path(r"^captcha/", include("captcha.re_paths")),
]
if settings.DEBUG:
@ -100,4 +113,4 @@ if settings.DEBUG:
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
import debug_toolbar
urlpatterns += [url(r"^__debug__/", include(debug_toolbar.urls))]
urlpatterns += [re_path(r"^__debug__/", include(debug_toolbar.urls))]