Merge "Django 4.x: Replace removed features"

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

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
 

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'),
 ]

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
 

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'),
 ]

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
 

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'),
 ]

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'

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'