fix: fixed django4 warnings (#29643)

openedx/core/djangoapps/user_api/admin.py

@@ -1,14 +1,11 @@
 """
 Django admin configuration pages for the user_api app
 """
-
-
-from django.conf.urls import url
 from django.contrib import admin, messages
 from django.core.exceptions import ValidationError
 from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.template.response import TemplateResponse
-from django.urls import reverse
+from django.urls import path, reverse
 from django.utils.html import format_html
 from django.utils.translation import gettext as _
 
@@ -89,11 +86,9 @@ class UserRetirementStatusAdmin(admin.ModelAdmin):
         """
         urls = super().get_urls()
         custom_urls = [
-            url(
-                r'^(?P<retirement_id>.+)/cancel_retirement/$',
-                self.admin_site.admin_view(self.cancel_retirement),
-                name='cancel-retirement',
-            ),
+            path('<path:retirement_id>/cancel_retirement/', self.admin_site.admin_view(self.cancel_retirement),
+                 name='cancel-retirement',
+                 ),
         ]
         return custom_urls + urls
 

openedx/core/djangoapps/user_api/helpers.py

@@ -349,12 +349,13 @@ class FormDescription:
 
 class LocalizedJSONEncoder(DjangoJSONEncoder):
     """
-    JSON handler that evaluates ugettext_lazy promises.
+    JSON handler that evaluates gettext_lazy promises.
     """
     # pylint: disable=method-hidden
+
     def default(self, obj):  # lint-amnesty, pylint: disable=arguments-differ
         """
-        Forces evaluation of ugettext_lazy promises.
+        Forces evaluation of gettext_lazy promises.
         """
         if isinstance(obj, Promise):
             return force_str(obj)

openedx/core/djangoapps/user_api/legacy_urls.py

@@ -1,7 +1,7 @@
 """
 Defines the URL routes for this app.
 """
-from django.conf.urls import include, url
+from django.urls import path, re_path, include
 from rest_framework import routers
 
 from . import views as user_api_views
@@ -13,24 +13,20 @@ USER_API_ROUTER.register(r'users', user_api_views.UserViewSet)
 USER_API_ROUTER.register(r'user_prefs', user_api_views.UserPreferenceViewSet)
 
 urlpatterns = [
-    url(r'^account/settings$', account_settings, name='account_settings'),
-    url(r'^user_api/v1/', include(USER_API_ROUTER.urls)),
-    url(
+    path('account/settings', account_settings, name='account_settings'),
+    path('user_api/v1/', include(USER_API_ROUTER.urls)),
+    re_path(
         fr'^user_api/v1/preferences/(?P<pref_key>{UserPreference.KEY_REGEX})/users/$',
         user_api_views.PreferenceUsersListView.as_view()
     ),
-    url(
+    re_path(
         r'^user_api/v1/forum_roles/(?P<name>[a-zA-Z]+)/users/$',
         user_api_views.ForumRoleUsersListView.as_view()
     ),
 
-    url(
-        r'^user_api/v1/preferences/email_opt_in/$',
-        user_api_views.UpdateEmailOptInPreference.as_view(),
-        name="preferences_email_opt_in_legacy"
-    ),
-    url(
-        r'^user_api/v1/preferences/time_zones/$',
-        user_api_views.CountryTimeZoneListView.as_view(),
-    ),
+    path('user_api/v1/preferences/email_opt_in/', user_api_views.UpdateEmailOptInPreference.as_view(),
+         name="preferences_email_opt_in_legacy"
+         ),
+    path('user_api/v1/preferences/time_zones/', user_api_views.CountryTimeZoneListView.as_view(),
+         ),
 ]