Skip to content

Commit 9fb398f

Browse files
KommuSoftKommuSoft
committed
towards flat path(..)s
1 parent 8111fac commit 9fb398f

3 files changed

Lines changed: 41 additions & 76 deletions

File tree

‎cbv/shortcut_urls.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from django.urls import re_path
1+
from django.urls import path
22

33
from cbv import views
44

55

66
urlpatterns = [
7-
re_path(
8-
r"(?P<klass>[a-zA-Z_-]+)/$",
7+
path(
8+
"<str:klass>/",
99
views.LatestKlassDetailView.as_view(),
1010
name="klass-detail-shortcut",
1111
),

‎cbv/urls.py‎

Lines changed: 36 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
django/1.41a/core/DjangoRuntimeWarning
1313
"""
1414

15-
from django.urls import include, path, reverse_lazy
15+
from django.urls import path, reverse_lazy
1616
from django.views.generic import RedirectView
1717

1818
from cbv import views
@@ -22,75 +22,40 @@
2222
path("", RedirectView.as_view(url=reverse_lazy("home"))),
2323
path(
2424
"<slug:package>/",
25-
include(
26-
[
27-
path(
28-
"",
29-
views.RedirectToLatestVersionView.as_view(),
30-
{"url_name": "version-detail"},
31-
),
32-
path(
33-
"latest/",
34-
include(
35-
[
36-
path(
37-
"",
38-
views.RedirectToLatestVersionView.as_view(),
39-
{"url_name": "version-detail"},
40-
name="latest-version-detail",
41-
),
42-
path(
43-
"<str:module>/",
44-
include(
45-
[
46-
path(
47-
"",
48-
views.RedirectToLatestVersionView.as_view(),
49-
{"url_name": "module-detail"},
50-
name="latest-module-detail",
51-
),
52-
path(
53-
"<str:klass>/",
54-
views.RedirectToLatestVersionView.as_view(),
55-
{"url_name": "klass-detail"},
56-
name="latest-klass-detail",
57-
),
58-
]
59-
),
60-
),
61-
]
62-
),
63-
),
64-
path(
65-
"<str:version>/",
66-
include(
67-
[
68-
path(
69-
"",
70-
views.VersionDetailView.as_view(),
71-
name="version-detail",
72-
),
73-
path(
74-
"<str:module>/",
75-
include(
76-
[
77-
path(
78-
"",
79-
views.ModuleDetailView.as_view(),
80-
name="module-detail",
81-
),
82-
path(
83-
"<str:klass>/",
84-
views.KlassDetailView.as_view(),
85-
name="klass-detail",
86-
),
87-
]
88-
),
89-
),
90-
]
91-
),
92-
),
93-
]
94-
),
25+
views.RedirectToLatestVersionView.as_view(),
26+
{"url_name": "version-detail"},
27+
),
28+
path(
29+
"<slug:package>/latest/",
30+
views.RedirectToLatestVersionView.as_view(),
31+
{"url_name": "version-detail"},
32+
name="latest-version-detail",
33+
),
34+
path(
35+
"<slug:package>/<str:version>/",
36+
views.VersionDetailView.as_view(),
37+
name="version-detail",
38+
),
39+
path(
40+
"<slug:package>/latest/<str:module>/",
41+
views.RedirectToLatestVersionView.as_view(),
42+
{"url_name": "module-detail"},
43+
name="latest-module-detail",
44+
),
45+
path(
46+
"<slug:package>/<str:version>/<str:module>/",
47+
views.ModuleDetailView.as_view(),
48+
name="module-detail",
49+
),
50+
path(
51+
"<slug:package>/latest/<str:module>/<str:klass>/",
52+
views.RedirectToLatestVersionView.as_view(),
53+
{"url_name": "klass-detail"},
54+
name="latest-klass-detail",
55+
),
56+
path(
57+
"<slug:package>/<str:version>/<str:module>/<str:klass>/",
58+
views.KlassDetailView.as_view(),
59+
name="klass-detail",
9560
),
9661
]

‎inspector/urls.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.conf import settings
22
from django.conf.urls.static import static
3-
from django.urls import include, path, re_path
3+
from django.urls import include, path
44
from django.views.generic import TemplateView
55

66
from cbv.views import HomeView, Sitemap
@@ -9,7 +9,7 @@
99
urlpatterns = [
1010
path("", HomeView.as_view(), name="home"),
1111
path("projects/", include("cbv.urls")),
12-
re_path(r"^sitemap\.xml$", Sitemap.as_view(), name="sitemap"),
12+
path("sitemap.xml", Sitemap.as_view(), name="sitemap"),
1313
path("", include("cbv.shortcut_urls"), {"package": "Django"}),
1414
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
1515

0 commit comments

Comments
 (0)