From dd488a76d1b84bbb835b6cf2d70a9fcaee2f708f Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan <60315450+aht007@users.noreply.github.com> Date: Fri, 25 Feb 2022 16:24:51 +0500 Subject: [PATCH] fix: fixed django40 warnings (#29641) * fix: fixed django4 warnings Co-authored-by: UsamaSadiq --- .../core/lib/api/tests/test_authentication.py | 16 ++-- openedx/core/lib/api/tests/test_view_utils.py | 4 +- openedx/features/announcements/urls.py | 12 +-- openedx/features/calendar_sync/urls.py | 12 +-- openedx/features/course_bookmarks/urls.py | 20 ++--- openedx/features/course_experience/urls.py | 76 +++++++------------ openedx/features/course_search/urls.py | 20 ++--- openedx/features/discounts/urls.py | 10 +-- openedx/features/learner_profile/urls.py | 12 ++- openedx/features/lti_course_tab/tab.py | 2 +- .../call_to_action.py | 2 +- .../testing/coverage_context_listener/urls.py | 4 +- 12 files changed, 73 insertions(+), 117 deletions(-) diff --git a/openedx/core/lib/api/tests/test_authentication.py b/openedx/core/lib/api/tests/test_authentication.py index b0ee328fd5..3888a015c4 100644 --- a/openedx/core/lib/api/tests/test_authentication.py +++ b/openedx/core/lib/api/tests/test_authentication.py @@ -11,12 +11,12 @@ from datetime import timedelta import ddt from django.conf import settings -from django.conf.urls import url from django.http import HttpResponse from django.test import TestCase from django.test.utils import override_settings from django.utils.http import urlencode from django.utils.timezone import now +from django.urls import path from oauth2_provider import models as dot_models from rest_framework import status from rest_framework.permissions import IsAuthenticated @@ -44,14 +44,12 @@ class MockView(APIView): # pylint: disable=missing-docstring urlpatterns = [ - url( - r'^oauth2-inactive-test/$', - MockView.as_view(authentication_classes=[authentication.BearerAuthenticationAllowInactiveUser]) - ), - url( - r'^oauth2-test/$', - MockView.as_view(authentication_classes=[authentication.BearerAuthentication]) - ) + path('oauth2-inactive-test/', + MockView.as_view(authentication_classes=[authentication.BearerAuthenticationAllowInactiveUser]) + ), + path('oauth2-test/', + MockView.as_view(authentication_classes=[authentication.BearerAuthentication]) + ) ] diff --git a/openedx/core/lib/api/tests/test_view_utils.py b/openedx/core/lib/api/tests/test_view_utils.py index 03b7536129..2886dd8063 100644 --- a/openedx/core/lib/api/tests/test_view_utils.py +++ b/openedx/core/lib/api/tests/test_view_utils.py @@ -1,8 +1,8 @@ """ Tests for (some of) the view utilities. """ -from django.conf.urls import url from django.test.utils import override_settings +from django.urls import re_path from rest_framework.response import Response from rest_framework.test import APITestCase from rest_framework.views import APIView @@ -28,7 +28,7 @@ class MockAPIView(DeveloperErrorViewMixin, APIView): return Response(f"Success {course_id}") urlpatterns = [ - url(r'^mock/(?P.*)/$', MockAPIView.as_view()), # Only works with new-style course keys + re_path(r'^mock/(?P.*)/$', MockAPIView.as_view()), # Only works with new-style course keys ] diff --git a/openedx/features/announcements/urls.py b/openedx/features/announcements/urls.py index 53fc85326d..0f0ad3a339 100644 --- a/openedx/features/announcements/urls.py +++ b/openedx/features/announcements/urls.py @@ -1,17 +1,13 @@ """ Defines URLs for announcements in the LMS. """ - - -from django.conf.urls import url from django.contrib.auth.decorators import login_required +from django.urls import path from .views import AnnouncementsJSONView urlpatterns = [ - url( - r'^page/(?P\d+)$', - login_required(AnnouncementsJSONView.as_view()), - name='page', - ), + path('page/', login_required(AnnouncementsJSONView.as_view()), + name='page', + ), ] diff --git a/openedx/features/calendar_sync/urls.py b/openedx/features/calendar_sync/urls.py index 35ae5373db..22367f3a96 100644 --- a/openedx/features/calendar_sync/urls.py +++ b/openedx/features/calendar_sync/urls.py @@ -2,15 +2,11 @@ Defines URLs for Calendar Sync. """ - -from django.conf.urls import url - +from django.urls import path from .views.calendar_sync import CalendarSyncView urlpatterns = [ - url( - r'^calendar_sync$', - CalendarSyncView.as_view(), - name='openedx.calendar_sync', - ), + path('calendar_sync', CalendarSyncView.as_view(), + name='openedx.calendar_sync', + ), ] diff --git a/openedx/features/course_bookmarks/urls.py b/openedx/features/course_bookmarks/urls.py index 4bc1f57cca..441d2b0d10 100644 --- a/openedx/features/course_bookmarks/urls.py +++ b/openedx/features/course_bookmarks/urls.py @@ -2,20 +2,14 @@ Defines URLs for course bookmarks. """ - -from django.conf.urls import url - +from django.urls import path from .views.course_bookmarks import CourseBookmarksFragmentView, CourseBookmarksView urlpatterns = [ - url( - r'^$', - CourseBookmarksView.as_view(), - name='openedx.course_bookmarks.home', - ), - url( - r'^bookmarks_fragment$', - CourseBookmarksFragmentView.as_view(), - name='openedx.course_bookmarks.course_bookmarks_fragment_view', - ), + path('', CourseBookmarksView.as_view(), + name='openedx.course_bookmarks.home', + ), + path('bookmarks_fragment', CourseBookmarksFragmentView.as_view(), + name='openedx.course_bookmarks.course_bookmarks_fragment_view', + ), ] diff --git a/openedx/features/course_experience/urls.py b/openedx/features/course_experience/urls.py index ae005c7883..5d81a6b819 100644 --- a/openedx/features/course_experience/urls.py +++ b/openedx/features/course_experience/urls.py @@ -2,9 +2,7 @@ Defines URLs for the course experience. """ - -from django.conf.urls import url - +from django.urls import path from .views.course_dates import CourseDatesFragmentMobileView from .views.course_home import CourseHomeFragmentView, CourseHomeView from .views.course_outline import CourseOutlineFragmentView @@ -16,49 +14,31 @@ COURSE_HOME_VIEW_NAME = 'openedx.course_experience.course_home' COURSE_DATES_FRAGMENT_VIEW_NAME = 'openedx.course_experience.mobile_dates_fragment_view' urlpatterns = [ - url( - r'^$', - CourseHomeView.as_view(), - name=COURSE_HOME_VIEW_NAME, - ), - url( - r'^updates$', - CourseUpdatesView.as_view(), - name='openedx.course_experience.course_updates', - ), - url( - r'^home_fragment$', - CourseHomeFragmentView.as_view(), - name='openedx.course_experience.course_home_fragment_view', - ), - url( - r'^outline_fragment$', - CourseOutlineFragmentView.as_view(), - name='openedx.course_experience.course_outline_fragment_view', - ), - url( - r'^updates_fragment$', - CourseUpdatesFragmentView.as_view(), - name='openedx.course_experience.course_updates_fragment_view', - ), - url( - r'^welcome_message_fragment$', - WelcomeMessageFragmentView.as_view(), - name='openedx.course_experience.welcome_message_fragment_view', - ), - url( - r'^latest_update_fragment$', - LatestUpdateFragmentView.as_view(), - name='openedx.course_experience.latest_update_fragment_view', - ), - url( - r'^dismiss_welcome_message$', - dismiss_welcome_message, - name='openedx.course_experience.dismiss_welcome_message', - ), - url( - r'^mobile_dates_fragment', - CourseDatesFragmentMobileView.as_view(), - name=COURSE_DATES_FRAGMENT_VIEW_NAME, - ), + path('', CourseHomeView.as_view(), + name=COURSE_HOME_VIEW_NAME, + ), + path('updates', CourseUpdatesView.as_view(), + name='openedx.course_experience.course_updates', + ), + path('home_fragment', CourseHomeFragmentView.as_view(), + name='openedx.course_experience.course_home_fragment_view', + ), + path('outline_fragment', CourseOutlineFragmentView.as_view(), + name='openedx.course_experience.course_outline_fragment_view', + ), + path('updates_fragment', CourseUpdatesFragmentView.as_view(), + name='openedx.course_experience.course_updates_fragment_view', + ), + path('welcome_message_fragment', WelcomeMessageFragmentView.as_view(), + name='openedx.course_experience.welcome_message_fragment_view', + ), + path('latest_update_fragment', LatestUpdateFragmentView.as_view(), + name='openedx.course_experience.latest_update_fragment_view', + ), + path('dismiss_welcome_message', dismiss_welcome_message, + name='openedx.course_experience.dismiss_welcome_message', + ), + path('mobile_dates_fragment', CourseDatesFragmentMobileView.as_view(), + name=COURSE_DATES_FRAGMENT_VIEW_NAME, + ), ] diff --git a/openedx/features/course_search/urls.py b/openedx/features/course_search/urls.py index 0988ebf278..b923c240cb 100644 --- a/openedx/features/course_search/urls.py +++ b/openedx/features/course_search/urls.py @@ -2,20 +2,14 @@ Defines URLs for course search. """ - -from django.conf.urls import url - +from django.urls import path from .views.course_search import CourseSearchFragmentView, CourseSearchView urlpatterns = [ - url( - r'^$', - CourseSearchView.as_view(), - name='openedx.course_search.course_search_results', - ), - url( - r'^home_fragment$', - CourseSearchFragmentView.as_view(), - name='openedx.course_search.course_search_results_fragment_view', - ), + path('', CourseSearchView.as_view(), + name='openedx.course_search.course_search_results', + ), + path('home_fragment', CourseSearchFragmentView.as_view(), + name='openedx.course_search.course_search_results_fragment_view', + ), ] diff --git a/openedx/features/discounts/urls.py b/openedx/features/discounts/urls.py index f3a9e29186..e5ff18daca 100644 --- a/openedx/features/discounts/urls.py +++ b/openedx/features/discounts/urls.py @@ -4,13 +4,13 @@ Discount API URLs from django.conf import settings -from django.conf.urls import url +from django.urls import re_path from .views import CourseUserDiscount, CourseUserDiscountWithUserParam urlpatterns = [ - url(fr'^course/{settings.COURSE_KEY_PATTERN}', CourseUserDiscount.as_view(), name='course_user_discount'), - url(fr'^user/(?P[^/]*)/course/{settings.COURSE_KEY_PATTERN}', - CourseUserDiscountWithUserParam.as_view(), - name='course_user_discount_with_param'), + re_path(fr'^course/{settings.COURSE_KEY_PATTERN}', CourseUserDiscount.as_view(), name='course_user_discount'), + re_path(fr'^user/(?P[^/]*)/course/{settings.COURSE_KEY_PATTERN}', + CourseUserDiscountWithUserParam.as_view(), + name='course_user_discount_with_param'), ] diff --git a/openedx/features/learner_profile/urls.py b/openedx/features/learner_profile/urls.py index d61590de6d..0f02076568 100644 --- a/openedx/features/learner_profile/urls.py +++ b/openedx/features/learner_profile/urls.py @@ -4,23 +4,21 @@ Defines URLs for the learner profile. from django.conf import settings -from django.conf.urls import url +from django.urls import path, re_path from openedx.features.learner_profile.views.learner_profile import learner_profile from .views.learner_achievements import LearnerAchievementsFragmentView urlpatterns = [ - url( + re_path( r'^{username_pattern}$'.format( username_pattern=settings.USERNAME_PATTERN, ), learner_profile, name='learner_profile', ), - url( - r'^achievements$', - LearnerAchievementsFragmentView.as_view(), - name='openedx.learner_profile.learner_achievements_fragment_view', - ), + path('achievements', LearnerAchievementsFragmentView.as_view(), + name='openedx.learner_profile.learner_achievements_fragment_view', + ), ] diff --git a/openedx/features/lti_course_tab/tab.py b/openedx/features/lti_course_tab/tab.py index 21142d26c9..50f6315180 100644 --- a/openedx/features/lti_course_tab/tab.py +++ b/openedx/features/lti_course_tab/tab.py @@ -7,7 +7,7 @@ from urllib.parse import quote from django.contrib.auth.models import AbstractBaseUser from django.contrib.sites.shortcuts import get_current_site from django.http import HttpRequest -from django.utils.translation import get_language, to_locale, gettext_lazy +from django.utils.translation import get_language, gettext_lazy, to_locale from lti_consumer.api import get_lti_pii_sharing_state_for_course from lti_consumer.lti_1p1.contrib.django import lti_embed from lti_consumer.models import LtiConfiguration diff --git a/openedx/features/personalized_learner_schedules/call_to_action.py b/openedx/features/personalized_learner_schedules/call_to_action.py index e7a75e5abe..4852daea3f 100644 --- a/openedx/features/personalized_learner_schedules/call_to_action.py +++ b/openedx/features/personalized_learner_schedules/call_to_action.py @@ -8,7 +8,7 @@ from crum import get_current_request from django.conf import settings from django.urls import reverse -from django.utils.translation import ngettext, gettext as _ +from django.utils.translation import gettext as _, ngettext from xmodule.util.misc import is_xblock_an_assignment from openedx.core.djangolib.markup import HTML, Text diff --git a/openedx/testing/coverage_context_listener/urls.py b/openedx/testing/coverage_context_listener/urls.py index 6e0ce8b5f1..25208d683a 100644 --- a/openedx/testing/coverage_context_listener/urls.py +++ b/openedx/testing/coverage_context_listener/urls.py @@ -1,9 +1,9 @@ """ Coverage Context Listener URLs. """ -from django.conf.urls import url +from django.urls import path from .views import update_context urlpatterns = [ - url(r'update_context', update_context), + path('update_context', update_context), ]