From ecce6298bf5c71161e480e218d2229cdcff3dd43 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 19 Jul 2022 15:40:40 -0400 Subject: [PATCH] Django 4.x: Replace removed features ugettext_lazy() and django.urls.url() are removed in 4.0. https: //docs.djangoproject.com/en/4.0/releases/4.0/ Change-Id: I58c20b15468dfe746956e131c09e63818ff8c45d --- zaqar_ui/api/rest/zaqar.py | 2 +- zaqar_ui/content/pool_flavors/panel.py | 2 +- zaqar_ui/content/pool_flavors/urls.py | 4 ++-- zaqar_ui/content/pools/panel.py | 2 +- zaqar_ui/content/pools/urls.py | 4 ++-- zaqar_ui/content/queues/panel.py | 2 +- zaqar_ui/content/queues/urls.py | 4 ++-- zaqar_ui/enabled/_1510_project_messaging_group.py | 2 +- zaqar_ui/enabled/_2510_admin_messaging_group.py | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/zaqar_ui/api/rest/zaqar.py b/zaqar_ui/api/rest/zaqar.py index 4788d9c..836403b 100644 --- a/zaqar_ui/api/rest/zaqar.py +++ b/zaqar_ui/api/rest/zaqar.py @@ -15,7 +15,7 @@ import json import yaml -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views import generic from openstack_dashboard.api.rest import urls from openstack_dashboard.api.rest import utils as rest_utils diff --git a/zaqar_ui/content/pool_flavors/panel.py b/zaqar_ui/content/pool_flavors/panel.py index 58dd421..5a5bf75 100644 --- a/zaqar_ui/content/pool_flavors/panel.py +++ b/zaqar_ui/content/pool_flavors/panel.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ import horizon diff --git a/zaqar_ui/content/pool_flavors/urls.py b/zaqar_ui/content/pool_flavors/urls.py index 7c99e65..b9a4039 100644 --- a/zaqar_ui/content/pool_flavors/urls.py +++ b/zaqar_ui/content/pool_flavors/urls.py @@ -10,10 +10,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf import urls +from django.urls import re_path from horizon.browsers import views urlpatterns = [ - urls.url(r'^$', views.AngularIndexView.as_view(), name='index'), + re_path(r'^$', views.AngularIndexView.as_view(), name='index'), ] diff --git a/zaqar_ui/content/pools/panel.py b/zaqar_ui/content/pools/panel.py index 7349553..775e3ae 100644 --- a/zaqar_ui/content/pools/panel.py +++ b/zaqar_ui/content/pools/panel.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ import horizon diff --git a/zaqar_ui/content/pools/urls.py b/zaqar_ui/content/pools/urls.py index 7c99e65..b9a4039 100644 --- a/zaqar_ui/content/pools/urls.py +++ b/zaqar_ui/content/pools/urls.py @@ -10,10 +10,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf import urls +from django.urls import re_path from horizon.browsers import views urlpatterns = [ - urls.url(r'^$', views.AngularIndexView.as_view(), name='index'), + re_path(r'^$', views.AngularIndexView.as_view(), name='index'), ] diff --git a/zaqar_ui/content/queues/panel.py b/zaqar_ui/content/queues/panel.py index 770e831..4b38ee8 100644 --- a/zaqar_ui/content/queues/panel.py +++ b/zaqar_ui/content/queues/panel.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ import horizon diff --git a/zaqar_ui/content/queues/urls.py b/zaqar_ui/content/queues/urls.py index 1ceb906..8284112 100644 --- a/zaqar_ui/content/queues/urls.py +++ b/zaqar_ui/content/queues/urls.py @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf import urls +from django.urls import re_path from horizon.browsers import views from zaqar_ui.content.queues import panel title = panel.Queues.name urlpatterns = [ - urls.url(r'^$', views.AngularIndexView.as_view(title=title), name='index'), + re_path(r'^$', views.AngularIndexView.as_view(title=title), name='index'), ] diff --git a/zaqar_ui/enabled/_1510_project_messaging_group.py b/zaqar_ui/enabled/_1510_project_messaging_group.py index 3544457..9b5b144 100644 --- a/zaqar_ui/enabled/_1510_project_messaging_group.py +++ b/zaqar_ui/enabled/_1510_project_messaging_group.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ # The slug of the panel group to be added to HORIZON_CONFIG. Required. PANEL_GROUP = 'messaging' diff --git a/zaqar_ui/enabled/_2510_admin_messaging_group.py b/zaqar_ui/enabled/_2510_admin_messaging_group.py index 5cda518..fa1f6d8 100644 --- a/zaqar_ui/enabled/_2510_admin_messaging_group.py +++ b/zaqar_ui/enabled/_2510_admin_messaging_group.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ # The slug of the panel group to be added to HORIZON_CONFIG. Required. PANEL_GROUP = 'messaging'