From 139b46e6114ef4769d8f898bb3e0e54b548b2e1f Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan <60315450+aht007@users.noreply.github.com> Date: Tue, 21 Dec 2021 12:44:50 +0500 Subject: [PATCH] fix: fixed RemovedInDjango40 warnings (#29588) --- lms/djangoapps/course_wiki/plugins/course_app.py | 2 +- .../templates/discussion/discussion_board_fragment.html | 2 +- .../templates/discussion/discussion_private_fragment.html | 2 +- .../templates/discussion/discussion_profile_page.html | 2 +- .../templates/discussion/maintenance_fragment.html | 2 +- lms/djangoapps/lms_xblock/mixin.py | 4 ++-- lms/djangoapps/save_for_later/api/urls.py | 5 +++-- lms/djangoapps/save_for_later/api/v1/urls.py | 5 ++--- lms/djangoapps/save_for_later/urls.py | 5 +++-- lms/djangoapps/teams/templates/teams/teams.html | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lms/djangoapps/course_wiki/plugins/course_app.py b/lms/djangoapps/course_wiki/plugins/course_app.py index 65762eda6b..1d007c386f 100644 --- a/lms/djangoapps/course_wiki/plugins/course_app.py +++ b/lms/djangoapps/course_wiki/plugins/course_app.py @@ -2,7 +2,7 @@ from typing import Dict, Optional, TYPE_CHECKING from django.conf import settings -from django.utils.translation import ugettext_noop as _ +from django.utils.translation import gettext_noop as _ from opaque_keys.edx.keys import CourseKey from openedx.core.djangoapps.content.course_overviews.models import CourseOverview, CourseOverviewTab diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html b/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html index eb8e1b66dc..be7bce1733 100644 --- a/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html +++ b/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html @@ -6,7 +6,7 @@ <%! import json -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.template.defaultfilters import escapejs from django.urls import reverse diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_private_fragment.html b/lms/djangoapps/discussion/templates/discussion/discussion_private_fragment.html index 6ba50e5dd2..57393552d9 100644 --- a/lms/djangoapps/discussion/templates/discussion/discussion_private_fragment.html +++ b/lms/djangoapps/discussion/templates/discussion/discussion_private_fragment.html @@ -3,7 +3,7 @@ <%page expression_filter="h"/> <%! -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ %> <%block name="content"> diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html b/lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html index 07f74aed27..f838643075 100644 --- a/lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html +++ b/lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html @@ -7,7 +7,7 @@ <%! import json -from django.utils.translation import ugettext as _, ungettext +from django.utils.translation import gettext as _, ungettext from django.template.defaultfilters import escapejs from django.urls import reverse diff --git a/lms/djangoapps/discussion/templates/discussion/maintenance_fragment.html b/lms/djangoapps/discussion/templates/discussion/maintenance_fragment.html index fddf691bfe..3ad2235400 100644 --- a/lms/djangoapps/discussion/templates/discussion/maintenance_fragment.html +++ b/lms/djangoapps/discussion/templates/discussion/maintenance_fragment.html @@ -3,7 +3,7 @@ <%page expression_filter="h"/> <%! -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ %> <%block name="content"> diff --git a/lms/djangoapps/lms_xblock/mixin.py b/lms/djangoapps/lms_xblock/mixin.py index 1ce3480f8e..67c2fd477a 100644 --- a/lms/djangoapps/lms_xblock/mixin.py +++ b/lms/djangoapps/lms_xblock/mixin.py @@ -2,7 +2,7 @@ Namespace that defines fields common to all blocks used in the LMS """ -#from django.utils.translation import ugettext_noop as _ +#from django.utils.translation import gettext_noop as _ from lazy import lazy @@ -196,7 +196,7 @@ class LmsBlockMixin(XBlockMixin): """ Validates the state of this xblock instance. """ - _ = self.runtime.service(self, "i18n").ugettext + _ = self.runtime.service(self, "i18n").gettext validation = super().validate() has_invalid_user_partitions = False has_invalid_groups = False diff --git a/lms/djangoapps/save_for_later/api/urls.py b/lms/djangoapps/save_for_later/api/urls.py index 4cfa0ce3d0..888e03dfe9 100644 --- a/lms/djangoapps/save_for_later/api/urls.py +++ b/lms/djangoapps/save_for_later/api/urls.py @@ -3,10 +3,11 @@ URL definitions for the save_for_later API. """ -from django.conf.urls import include, url +from django.conf.urls import include +from django.urls import path app_name = 'lms.djangoapps.save_for_later' urlpatterns = [ - url(r'^v1/', include(('lms.djangoapps.save_for_later.api.v1.urls', 'v1'), namespace='v1')), + path('v1/', include(('lms.djangoapps.save_for_later.api.v1.urls', 'v1'), namespace='v1')), ] diff --git a/lms/djangoapps/save_for_later/api/v1/urls.py b/lms/djangoapps/save_for_later/api/v1/urls.py index 21cf74018d..726427436a 100644 --- a/lms/djangoapps/save_for_later/api/v1/urls.py +++ b/lms/djangoapps/save_for_later/api/v1/urls.py @@ -2,11 +2,10 @@ URLs for save_for_later v1 """ - -from django.conf.urls import url +from django.urls import path from lms.djangoapps.save_for_later.api.v1.views import SaveForLaterApiView urlpatterns = [ - url(r'^save/course/', SaveForLaterApiView.as_view(), name='save_course'), + path(r'^save/course/', SaveForLaterApiView.as_view(), name='save_course'), ] diff --git a/lms/djangoapps/save_for_later/urls.py b/lms/djangoapps/save_for_later/urls.py index 3972571bb3..98a7c3b317 100644 --- a/lms/djangoapps/save_for_later/urls.py +++ b/lms/djangoapps/save_for_later/urls.py @@ -1,7 +1,8 @@ """ URLs for save_for_later """ -from django.conf.urls import include, url +from django.conf.urls import include +from django.urls import path urlpatterns = [ - url(r'^api/', include(('lms.djangoapps.save_for_later.api.urls', 'api'), namespace='api')), + path(r'^api/', include(('lms.djangoapps.save_for_later.api.urls', 'api'), namespace='api')), ] diff --git a/lms/djangoapps/teams/templates/teams/teams.html b/lms/djangoapps/teams/templates/teams/teams.html index 65d25f8d1f..a1282c5835 100644 --- a/lms/djangoapps/teams/templates/teams/teams.html +++ b/lms/djangoapps/teams/templates/teams/teams.html @@ -6,7 +6,7 @@ <%! import six -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from openedx.core.djangolib.js_utils import ( dump_js_escaped_json, js_escaped_string )