From 1ea4f6d15d0126eaa024dfb982d2dfd834145a44 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 23 Mar 2022 21:53:10 +0900 Subject: [PATCH] Replace deprecated django.conf.urls.url() This method is deprecated in Django 3.1[1], in favor of django.urls.re_path(), and triggers the following warning. RemovedInDjango40Warning: django.conf.urls.url() is deprecated in favor of django.urls.re_path(). This was already fixed in Horizon by [2]. [1] https://docs.djangoproject.com/en/4.0/releases/3.1/#id2 [2] d9266fd82c1f0acc6b7236a6dc9b7e510985eb13 Change-Id: Ib921e98f220efb697e42673ca43da36cc151e7c7 --- heat_dashboard/content/resource_types/urls.py | 8 ++-- heat_dashboard/content/stacks/urls.py | 42 +++++++++---------- .../content/template_generator/urls.py | 8 ++-- .../content/template_versions/urls.py | 8 ++-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/heat_dashboard/content/resource_types/urls.py b/heat_dashboard/content/resource_types/urls.py index e3729a48..ccf4b998 100644 --- a/heat_dashboard/content/resource_types/urls.py +++ b/heat_dashboard/content/resource_types/urls.py @@ -11,12 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import url +from django.urls import re_path from heat_dashboard.content.resource_types import views urlpatterns = [ - url(r'^$', views.ResourceTypesView.as_view(), name='index'), - url(r'^(?P[^/]+)/$', - views.DetailView.as_view(), name='details'), + re_path(r'^$', views.ResourceTypesView.as_view(), name='index'), + re_path(r'^(?P[^/]+)/$', + views.DetailView.as_view(), name='details'), ] diff --git a/heat_dashboard/content/stacks/urls.py b/heat_dashboard/content/stacks/urls.py index 77aa1f57..6118b283 100644 --- a/heat_dashboard/content/stacks/urls.py +++ b/heat_dashboard/content/stacks/urls.py @@ -10,29 +10,29 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import url +from django.urls import re_path from heat_dashboard.content.stacks import views urlpatterns = [ - url(r'^$', views.IndexView.as_view(), name='index'), - url(r'^select_template$', - views.SelectTemplateView.as_view(), - name='select_template'), - url(r'^launch$', views.CreateStackView.as_view(), name='launch'), - url(r'^preview_template$', - views.PreviewTemplateView.as_view(), name='preview_template'), - url(r'^preview$', views.PreviewStackView.as_view(), name='preview'), - url(r'^preview_details$', - views.PreviewStackDetailsView.as_view(), name='preview_details'), - url(r'^stack/(?P[^/]+)/$', - views.DetailView.as_view(), name='detail'), - url(r'^(?P[^/]+)/change_template$', - views.ChangeTemplateView.as_view(), name='change_template'), - url(r'^(?P[^/]+)/edit_stack$', - views.EditStackView.as_view(), name='edit_stack'), - url(r'^stack/(?P[^/]+)/(?P[^/]+)/$', - views.ResourceView.as_view(), name='resource'), - url(r'^get_d3_data/(?P[^/]+)/$', - views.JSONView.as_view(), name='d3_data'), + re_path(r'^$', views.IndexView.as_view(), name='index'), + re_path(r'^select_template$', + views.SelectTemplateView.as_view(), + name='select_template'), + re_path(r'^launch$', views.CreateStackView.as_view(), name='launch'), + re_path(r'^preview_template$', + views.PreviewTemplateView.as_view(), name='preview_template'), + re_path(r'^preview$', views.PreviewStackView.as_view(), name='preview'), + re_path(r'^preview_details$', + views.PreviewStackDetailsView.as_view(), name='preview_details'), + re_path(r'^stack/(?P[^/]+)/$', + views.DetailView.as_view(), name='detail'), + re_path(r'^(?P[^/]+)/change_template$', + views.ChangeTemplateView.as_view(), name='change_template'), + re_path(r'^(?P[^/]+)/edit_stack$', + views.EditStackView.as_view(), name='edit_stack'), + re_path(r'^stack/(?P[^/]+)/(?P[^/]+)/$', + views.ResourceView.as_view(), name='resource'), + re_path(r'^get_d3_data/(?P[^/]+)/$', + views.JSONView.as_view(), name='d3_data'), ] diff --git a/heat_dashboard/content/template_generator/urls.py b/heat_dashboard/content/template_generator/urls.py index e82572db..488f16e9 100644 --- a/heat_dashboard/content/template_generator/urls.py +++ b/heat_dashboard/content/template_generator/urls.py @@ -10,12 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import url +from django.urls import re_path from heat_dashboard.content.template_generator import views urlpatterns = [ - url(r'^$', views.IndexView.as_view(), name='index'), - url(r'^get_resource_options$', - views.OptionView.as_view(), name="apis"), + re_path(r'^$', views.IndexView.as_view(), name='index'), + re_path(r'^get_resource_options$', + views.OptionView.as_view(), name="apis"), ] diff --git a/heat_dashboard/content/template_versions/urls.py b/heat_dashboard/content/template_versions/urls.py index b3dcd0fc..18b9ee74 100644 --- a/heat_dashboard/content/template_versions/urls.py +++ b/heat_dashboard/content/template_versions/urls.py @@ -11,13 +11,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import url +from django.urls import re_path from heat_dashboard.content.template_versions import views urlpatterns = [ - url(r'^$', views.TemplateVersionsView.as_view(), name='index'), - url(r'^(?P[^/]+)/$', - views.DetailView.as_view(), name='details'), + re_path(r'^$', views.TemplateVersionsView.as_view(), name='index'), + re_path(r'^(?P[^/]+)/$', + views.DetailView.as_view(), name='details'), ]