From 4a11c86533cf1b6ab7be415d2c3f362f0e468100 Mon Sep 17 00:00:00 2001 From: Awais Qureshi <awais.qureshi@arbisoft.com> Date: Thu, 18 Mar 2021 12:23:52 +0500 Subject: [PATCH] Pyupgrade in common/djangoapps/coursemodes. --- common/djangoapps/course_modes/tests/test_models.py | 1 - common/djangoapps/course_modes/tests/test_signals.py | 2 +- common/djangoapps/course_modes/tests/test_views.py | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/djangoapps/course_modes/tests/test_models.py b/common/djangoapps/course_modes/tests/test_models.py index ecd46e3e652..7279166929e 100644 --- a/common/djangoapps/course_modes/tests/test_models.py +++ b/common/djangoapps/course_modes/tests/test_models.py @@ -11,7 +11,6 @@ from datetime import timedelta from unittest.mock import patch import ddt -import six from django.core.exceptions import ValidationError from django.test import TestCase, override_settings from django.utils.timezone import now diff --git a/common/djangoapps/course_modes/tests/test_signals.py b/common/djangoapps/course_modes/tests/test_signals.py index 9c6ca5f9c4e..d244f692b88 100644 --- a/common/djangoapps/course_modes/tests/test_signals.py +++ b/common/djangoapps/course_modes/tests/test_signals.py @@ -4,10 +4,10 @@ Unit tests for the course_mode signals from datetime import datetime, timedelta +from unittest.mock import patch import ddt from django.conf import settings -from unittest.mock import patch from pytz import UTC from common.djangoapps.course_modes.models import CourseMode diff --git a/common/djangoapps/course_modes/tests/test_views.py b/common/djangoapps/course_modes/tests/test_views.py index 3603af4964b..d60c1908916 100644 --- a/common/djangoapps/course_modes/tests/test_views.py +++ b/common/djangoapps/course_modes/tests/test_views.py @@ -6,6 +6,7 @@ Tests for course_modes views. import decimal import unittest from datetime import datetime, timedelta +from unittest.mock import patch import ddt import freezegun @@ -14,20 +15,19 @@ import pytz import six from django.conf import settings from django.urls import reverse -from unittest.mock import patch from common.djangoapps.course_modes.models import CourseMode, Mode from common.djangoapps.course_modes.tests.factories import CourseModeFactory +from common.djangoapps.student.models import CourseEnrollment +from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory +from common.djangoapps.util.testing import UrlResetMixin +from common.djangoapps.util.tests.mixins.discovery import CourseCatalogServiceMockMixin from lms.djangoapps.commerce.tests import test_utils as ecomm_test_utils from lms.djangoapps.commerce.tests.mocks import mock_payment_processors from lms.djangoapps.verify_student.services import IDVerificationService from openedx.core.djangoapps.catalog.tests.mixins import CatalogIntegrationMixin from openedx.core.djangoapps.embargo.test_utils import restrict_course from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme -from common.djangoapps.student.models import CourseEnrollment -from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory -from common.djangoapps.util.testing import UrlResetMixin -from common.djangoapps.util.tests.mixins.discovery import CourseCatalogServiceMockMixin from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory -- GitLab