BOM-2442

pyupgrade in enterprise-support.

openedx/features/enterprise_support/tests/test_api.py

@@ -1,9 +1,10 @@
 """
 Test the enterprise support APIs.
 """
+from unittest import mock
+
 import ddt
 import httpretty
-from unittest import mock
 import pytest
 from consent.models import DataSharingConsent
 from django.conf import settings
@@ -21,7 +22,6 @@ from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
 from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, skip_unless_lms
 from openedx.features.enterprise_support.api import (
-    activate_learner_enterprise,
     _CACHE_MISS,
     ENTERPRISE_CUSTOMER_KEY_NAME,
     ConsentApiClient,
@@ -29,6 +29,7 @@ from openedx.features.enterprise_support.api import (
     EnterpriseApiClient,
     EnterpriseApiException,
     EnterpriseApiServiceClient,
+    activate_learner_enterprise,
     add_enterprise_customer_to_session,
     consent_needed_for_course,
     data_sharing_consent_required,

openedx/features/enterprise_support/tests/test_logout.py

@@ -3,12 +3,14 @@ Tests for logout for enterprise flow
 """
 
 
-import ddt
 from unittest import mock
 
+import ddt
 from django.test.utils import override_settings
 from django.urls import reverse
 
+from common.djangoapps.student.tests.factories import UserFactory
+from common.djangoapps.util.testing import UrlResetMixin
 from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, skip_unless_lms
 from openedx.features.enterprise_support.api import enterprise_enabled
 from openedx.features.enterprise_support.tests import (
@@ -17,8 +19,6 @@ from openedx.features.enterprise_support.tests import (
     factories
 )
 from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseServiceMockMixin
-from common.djangoapps.student.tests.factories import UserFactory
-from common.djangoapps.util.testing import UrlResetMixin
 
 
 @ddt.ddt

openedx/features/enterprise_support/tests/test_signals.py

@@ -3,21 +3,23 @@
 
 import logging
 from datetime import timedelta
+from unittest.mock import patch
 
 import ddt
 from django.test.utils import override_settings
 from django.utils.timezone import now
 from edx_django_utils.cache import TieredCache
-from unittest.mock import patch
 from opaque_keys.edx.keys import CourseKey
 from slumber.exceptions import HttpClientError, HttpServerError
 from testfixtures import LogCapture
 
 from common.djangoapps.course_modes.tests.factories import CourseModeFactory
+from common.djangoapps.student.models import CourseEnrollmentAttribute
+from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from lms.djangoapps.certificates.signals import listen_for_passing_grade
 from openedx.core.djangoapps.commerce.utils import ECOMMERCE_DATE_FORMAT
 from openedx.core.djangoapps.credit.tests.test_api import TEST_ECOMMERCE_WORKER
-from openedx.core.djangoapps.signals.signals import COURSE_GRADE_NOW_PASSED, COURSE_ASSESSMENT_GRADE_CHANGED
+from openedx.core.djangoapps.signals.signals import COURSE_ASSESSMENT_GRADE_CHANGED, COURSE_GRADE_NOW_PASSED
 from openedx.features.enterprise_support.tests import FEATURES_WITH_ENTERPRISE_ENABLED
 from openedx.features.enterprise_support.tests.factories import (
     EnterpriseCourseEnrollmentFactory,
@@ -25,8 +27,6 @@ from openedx.features.enterprise_support.tests.factories import (
     EnterpriseCustomerUserFactory
 )
 from openedx.features.enterprise_support.utils import get_data_consent_share_cache_key
-from common.djangoapps.student.models import CourseEnrollmentAttribute
-from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 

openedx/features/enterprise_support/tests/test_utils.py

@@ -4,15 +4,16 @@ Test the enterprise support utils.
 
 import json
 import uuid
+from unittest import mock
 
 import ddt
-from unittest import mock
 from django.conf import settings
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.urls import NoReverseMatch
-
 from edx_toggles.toggles.testutils import override_waffle_flag
+
+from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangolib.testing.utils import skip_unless_lms
 from openedx.features.enterprise_support.tests import FEATURES_WITH_ENTERPRISE_ENABLED
 from openedx.features.enterprise_support.tests.factories import (
@@ -36,9 +37,8 @@ from openedx.features.enterprise_support.utils import (
     is_enterprise_learner,
     update_account_settings_context_for_enterprise,
     update_logistration_context_for_enterprise,
-    update_third_party_auth_context_for_enterprise,
+    update_third_party_auth_context_for_enterprise
 )
-from common.djangoapps.student.tests.factories import UserFactory
 
 
 @ddt.ddt