Skip to content

Commit 7ac2922

Browse files
manchandavishalmanchandavishal
committed
Address RemovedInDjango40Warning
In Django 3.1, django.conf.urls.url() is deprecated in favor of django.urls.re_path(). For more info see [1] These were already replaced in Horizon repo by [2]. [1] https://docs.djangoproject.com/en/4.0/releases/3.1/#id2 [2] https://review.opendev.org/c/openstack/horizon/+/827093 Change-Id: I5086fe5fecd46e9e2ffb223b163fbaa8ed9c1970
1 parent 8837a1d commit 7ac2922

File tree

7 files changed

+72
-71
lines changed

7 files changed

+72
-71
lines changed

‎cloudkittydashboard/dashboards/admin/hashmap/urls.py‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,55 @@
1212
# License for the specific language governing permissions and limitations
1313
# under the License.
1414

15-
from django.conf.urls import url
15+
from django.urls import re_path
1616

1717
from cloudkittydashboard.dashboards.admin.hashmap import views
1818

1919
urlpatterns = [
20-
url(r'^$', views.IndexView.as_view(), name='index'),
21-
url(r'^service/(?P<service_id>[^/]+)/?$',
22-
views.ServiceView.as_view(),
23-
name='service'),
24-
url(r'^create_service/?$',
25-
views.ServiceCreateView.as_view(),
26-
name='service_create'),
27-
url(r'^field/(?P<field_id>[^/]+)/?$',
28-
views.FieldView.as_view(),
29-
name='field'),
30-
url(r'^group/(?P<group_id>[^/]+)/?$',
31-
views.GroupView.as_view(),
32-
name='group'),
33-
url(r'^group/(?P<group_id>[^/]+)/details/?$',
34-
views.GroupDetailsView.as_view(),
35-
name='group_details'),
36-
url(r'^create_field/service/(?P<service_id>[^/]+)/?$',
37-
views.FieldCreateView.as_view(),
38-
name='field_create'),
39-
url(r'^create_group/(?:(?P<service_id>[^/]+)/)?$',
40-
views.GroupCreateView.as_view(),
41-
name='group_create'),
42-
url(r'^create_threshold/service/(?P<service_id>[^/]+)/?$',
43-
views.ServiceThresholdCreateView.as_view(),
44-
name='service_threshold_create'),
45-
url(r'^create_threshold/field/(?P<field_id>[^/]+)/?$',
46-
views.FieldThresholdCreateView.as_view(),
47-
name='field_threshold_create'),
48-
url(r'^create_mapping/service/(?P<service_id>[^/]+)/?$',
49-
views.ServiceMappingCreateView.as_view(),
50-
name='service_mapping_create'),
51-
url(r'^create_mapping/field/(?P<field_id>[^/]+)/?$',
52-
views.FieldMappingCreateView.as_view(),
53-
name='field_mapping_create'),
54-
url(r'^edit_mapping/service/(?P<mapping_id>[^/]+)/?$',
55-
views.ServiceMappingEditView.as_view(),
56-
name='service_mapping_edit'),
57-
url(r'^edit_mapping/field/(?P<mapping_id>[^/]+)/?$',
58-
views.FieldMappingEditView.as_view(),
59-
name='field_mapping_edit'),
60-
url(r'^edit_threshold/service/(?P<threshold_id>[^/]+)/?$',
61-
views.ServiceThresholdEditView.as_view(),
62-
name='service_threshold_edit'),
63-
url(r'^edit_threshold/field/(?P<threshold_id>[^/]+)/?$',
64-
views.FieldThresholdEditView.as_view(),
65-
name='field_threshold_edit'),
20+
re_path(r'^$', views.IndexView.as_view(), name='index'),
21+
re_path(r'^service/(?P<service_id>[^/]+)/?$',
22+
views.ServiceView.as_view(),
23+
name='service'),
24+
re_path(r'^create_service/?$',
25+
views.ServiceCreateView.as_view(),
26+
name='service_create'),
27+
re_path(r'^field/(?P<field_id>[^/]+)/?$',
28+
views.FieldView.as_view(),
29+
name='field'),
30+
re_path(r'^group/(?P<group_id>[^/]+)/?$',
31+
views.GroupView.as_view(),
32+
name='group'),
33+
re_path(r'^group/(?P<group_id>[^/]+)/details/?$',
34+
views.GroupDetailsView.as_view(),
35+
name='group_details'),
36+
re_path(r'^create_field/service/(?P<service_id>[^/]+)/?$',
37+
views.FieldCreateView.as_view(),
38+
name='field_create'),
39+
re_path(r'^create_group/(?:(?P<service_id>[^/]+)/)?$',
40+
views.GroupCreateView.as_view(),
41+
name='group_create'),
42+
re_path(r'^create_threshold/service/(?P<service_id>[^/]+)/?$',
43+
views.ServiceThresholdCreateView.as_view(),
44+
name='service_threshold_create'),
45+
re_path(r'^create_threshold/field/(?P<field_id>[^/]+)/?$',
46+
views.FieldThresholdCreateView.as_view(),
47+
name='field_threshold_create'),
48+
re_path(r'^create_mapping/service/(?P<service_id>[^/]+)/?$',
49+
views.ServiceMappingCreateView.as_view(),
50+
name='service_mapping_create'),
51+
re_path(r'^create_mapping/field/(?P<field_id>[^/]+)/?$',
52+
views.FieldMappingCreateView.as_view(),
53+
name='field_mapping_create'),
54+
re_path(r'^edit_mapping/service/(?P<mapping_id>[^/]+)/?$',
55+
views.ServiceMappingEditView.as_view(),
56+
name='service_mapping_edit'),
57+
re_path(r'^edit_mapping/field/(?P<mapping_id>[^/]+)/?$',
58+
views.FieldMappingEditView.as_view(),
59+
name='field_mapping_edit'),
60+
re_path(r'^edit_threshold/service/(?P<threshold_id>[^/]+)/?$',
61+
views.ServiceThresholdEditView.as_view(),
62+
name='service_threshold_edit'),
63+
re_path(r'^edit_threshold/field/(?P<threshold_id>[^/]+)/?$',
64+
views.FieldThresholdEditView.as_view(),
65+
name='field_threshold_edit'),
6666
]

‎cloudkittydashboard/dashboards/admin/modules/urls.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
# License for the specific language governing permissions and limitations
1313
# under the License.
1414

15-
from django.conf.urls import url
15+
from django.urls import re_path
1616

1717
from cloudkittydashboard.dashboards.admin.modules import views
1818

1919
urlpatterns = [
20-
url(r'^$', views.IndexView.as_view(), name='index'),
21-
url(r'^(?P<module_id>[^/]+)/?$', views.ModuleDetailsView.as_view(),
22-
name="module_details"),
23-
url(r'^edit_priority/(?P<module_id>[^/]+)/?$',
24-
views.PriorityModuleEditView.as_view(),
25-
name="edit_priority"),
20+
re_path(r'^$', views.IndexView.as_view(), name='index'),
21+
re_path(r'^(?P<module_id>[^/]+)/?$', views.ModuleDetailsView.as_view(),
22+
name="module_details"),
23+
re_path(r'^edit_priority/(?P<module_id>[^/]+)/?$',
24+
views.PriorityModuleEditView.as_view(),
25+
name="edit_priority"),
2626
]

‎cloudkittydashboard/dashboards/admin/pyscripts/urls.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@
1212
# License for the specific language governing permissions and limitations
1313
# under the License.
1414

15-
from django.conf.urls import url
15+
from django.urls import re_path
1616

1717
from cloudkittydashboard.dashboards.admin.pyscripts import views
1818

1919
urlpatterns = [
20-
url(r'^$', views.IndexView.as_view(), name='index'),
21-
url(r'^create/?$', views.ScriptCreateView.as_view(), name="script_create"),
22-
url(r'^update/(?P<script_id>[^/]+)/?$', views.ScriptUpdateView.as_view(),
23-
name="script_update"),
24-
url(r'^(?P<script_id>[^/]+)/?$', views.ScriptDetailsView.as_view(),
25-
name="script_details"),
20+
re_path(r'^$', views.IndexView.as_view(), name='index'),
21+
re_path(r'^create/?$', views.ScriptCreateView.as_view(),
22+
name="script_create"),
23+
re_path(r'^update/(?P<script_id>[^/]+)/?$',
24+
views.ScriptUpdateView.as_view(),
25+
name="script_update"),
26+
re_path(r'^(?P<script_id>[^/]+)/?$', views.ScriptDetailsView.as_view(),
27+
name="script_details"),
2628
]

‎cloudkittydashboard/dashboards/admin/summary/urls.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# License for the specific language governing permissions and limitations
1313
# under the License.
1414

15-
from django.conf.urls import url
15+
from django.urls import re_path
1616

1717
from cloudkittydashboard.dashboards.admin.summary import views
1818

1919
urlpatterns = [
20-
url(r'^$', views.IndexView.as_view(), name='index'),
21-
url(r'^(?P<project_id>[^/]+)/?$', views.TenantDetailsView.as_view(),
22-
name="project_details"),
20+
re_path(r'^$', views.IndexView.as_view(), name='index'),
21+
re_path(r'^(?P<project_id>[^/]+)/?$', views.TenantDetailsView.as_view(),
22+
name="project_details"),
2323
]

‎cloudkittydashboard/dashboards/project/rating/urls.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
# License for the specific language governing permissions and limitations
1313
# under the License.
1414

15-
from django.conf.urls import url
15+
from django.urls import re_path
1616

1717
from cloudkittydashboard.dashboards.project.rating import views
1818

1919
urlpatterns = [
20-
url(r'^$', views.IndexView.as_view(), name='index'),
21-
url(r'^quote$', views.quote, name='quote')
20+
re_path(r'^$', views.IndexView.as_view(), name='index'),
21+
re_path(r'^quote$', views.quote, name='quote')
2222
]

‎cloudkittydashboard/dashboards/project/reporting/urls.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from django.conf.urls import url
1+
from django.urls import re_path
22

33
from cloudkittydashboard.dashboards.project.reporting import views
44

55
urlpatterns = [
6-
url(r'^$', views.IndexView.as_view(), name='index'),
6+
re_path(r'^$', views.IndexView.as_view(), name='index'),
77
]

‎cloudkittydashboard/overrides.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# under the License.
1515
#
1616

17-
from django.conf.urls import url # noqa
1817
from django.utils.translation import ugettext_lazy as _
1918
from openstack_dashboard.dashboards.project.instances.workflows \
2019
import create_instance

0 commit comments

Comments
 (0)