Run all touched files through isort.

common/djangoapps/student/tests/test_refunds.py

@@ -18,11 +18,11 @@ from edx_rest_api_client.exceptions import SlumberBaseException
 from mock import patch
 from slumber.exceptions import HttpClientError, HttpServerError
 
+from certificates.models import CertificateStatuses, GeneratedCertificate  # pylint: disable=import-error
+from certificates.tests.factories import GeneratedCertificateFactory  # pylint: disable=import-error
 # These imports refer to lms djangoapps.
 # Their testcases are only run under lms.
 from course_modes.tests.factories import CourseModeFactory
-from certificates.models import CertificateStatuses, GeneratedCertificate  # pylint: disable=import-error
-from certificates.tests.factories import GeneratedCertificateFactory  # pylint: disable=import-error
 from openedx.core.djangoapps.commerce.utils import ECOMMERCE_DATE_FORMAT
 from student.models import CourseEnrollment, CourseEnrollmentAttribute
 from student.tests.factories import UserFactory

common/djangoapps/student/tests/test_views.py

@@ -14,17 +14,17 @@ from django.core.urlresolvers import reverse
 from django.test import RequestFactory, TestCase
 from edx_oauth2_provider.constants import AUTHORIZED_CLIENTS_SESSION_KEY
 from edx_oauth2_provider.tests.factories import ClientFactory, TrustedClientFactory
+from milestones.tests.utils import MilestonesTestCaseMixin
 from mock import patch
-from pyquery import PyQuery as pq
 from opaque_keys import InvalidKeyError
+from pyquery import PyQuery as pq
 
-from milestones.tests.utils import MilestonesTestCaseMixin
 from student.cookies import get_user_info_cookie_data
 from student.helpers import DISABLE_UNENROLL_CERT_STATES
 from student.models import CourseEnrollment, UserProfile
 from student.signals import REFUND_ORDER
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
-from util.milestones_helpers import set_prerequisite_courses, remove_prerequisite_course, get_course_milestones
+from util.milestones_helpers import get_course_milestones, remove_prerequisite_course, set_prerequisite_courses
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory

lms/djangoapps/commerce/api/v0/tests/test_views.py

@@ -17,19 +17,19 @@ from nose.plugins.attrib import attr
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
 from enrollment.api import get_enrollment
-from ..views import SAILTHRU_CAMPAIGN_COOKIE
-from ....constants import Messages
-from ....tests.mocks import mock_basket_order
-from ....tests.test_views import UserMixin
 from openedx.core.djangoapps.embargo.test_utils import restrict_course
 from openedx.core.lib.django_test_client_utils import get_absolute_url
 from student.models import CourseEnrollment
-from course_modes.tests.factories import CourseModeFactory
 from student.tests.tests import EnrollmentEventTestMixin
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
+from ....constants import Messages
+from ....tests.mocks import mock_basket_order
+from ....tests.test_views import UserMixin
+from ..views import SAILTHRU_CAMPAIGN_COOKIE
+
 UTM_COOKIE_NAME = 'edx.test.utm'
 UTM_COOKIE_CONTENTS = {
     'utm_source': 'test-source'

lms/djangoapps/commerce/api/v0/views.py

@@ -13,8 +13,6 @@ from course_modes.models import CourseMode
 from courseware import courses
 from enrollment.api import add_enrollment
 from enrollment.views import EnrollmentCrossDomainSessionAuth
-from ...constants import Messages
-from ...http import DetailResponse
 from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
 from openedx.core.djangoapps.embargo import api as embargo_api
 from openedx.core.djangoapps.user_api.preferences.api import update_email_opt_in
@@ -22,6 +20,9 @@ from openedx.core.lib.api.authentication import OAuth2AuthenticationAllowInactiv
 from student.models import CourseEnrollment
 from util.json_request import JsonResponse
 
+from ...constants import Messages
+from ...http import DetailResponse
+
 log = logging.getLogger(__name__)
 SAILTHRU_CAMPAIGN_COOKIE = 'sailthru_bid'
 

lms/djangoapps/commerce/api/v1/permissions.py

@@ -3,10 +3,11 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from rest_framework.permissions import BasePermission, DjangoModelPermissions
 
-from ...utils import is_account_activation_requirement_disabled
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.lib.api.permissions import ApiKeyHeaderPermission
 
+from ...utils import is_account_activation_requirement_disabled
+
 
 class ApiKeyOrModelPermission(BasePermission):
     """ Access granted for requests with API key in header,

lms/djangoapps/commerce/api/v1/serializers.py

@@ -8,9 +8,10 @@ from opaque_keys.edx.keys import CourseKey
 from rest_framework import serializers
 
 from course_modes.models import CourseMode
-from .models import Course
 from xmodule.modulestore.django import modulestore
 
+from .models import Course
+
 
 class CourseModeSerializer(serializers.ModelSerializer):
     """ CourseMode serializer. """

lms/djangoapps/commerce/api/v1/tests/test_models.py

@@ -3,6 +3,7 @@ import ddt
 from django.test import TestCase
 
 from course_modes.models import CourseMode
+
 from ..models import Course
 
 

lms/djangoapps/commerce/api/v1/tests/test_views.py

@@ -15,13 +15,14 @@ from nose.plugins.attrib import attr
 from rest_framework.utils.encoders import JSONEncoder
 
 from course_modes.models import CourseMode
-from ....tests.mocks import mock_order_endpoint
-from ....tests.test_views import UserMixin
 from lms.djangoapps.verify_student.models import VerificationDeadline
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
+from ....tests.mocks import mock_order_endpoint
+from ....tests.test_views import UserMixin
+
 PASSWORD = 'test'
 JSON_CONTENT_TYPE = 'application/json'
 

lms/djangoapps/commerce/api/v1/views.py

@@ -11,14 +11,15 @@ from rest_framework.views import APIView
 from rest_framework_oauth.authentication import OAuth2Authentication
 
 from course_modes.models import CourseMode
-from .models import Course
-from .permissions import ApiKeyOrModelPermission, IsAuthenticatedOrActivationOverridden
-from .serializers import CourseSerializer
-from ...utils import is_account_activation_requirement_disabled
 from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
 from openedx.core.lib.api.mixins import PutAsCreateMixin
 from util.json_request import JsonResponse
 
+from ...utils import is_account_activation_requirement_disabled
+from .models import Course
+from .permissions import ApiKeyOrModelPermission, IsAuthenticatedOrActivationOverridden
+from .serializers import CourseSerializer
+
 log = logging.getLogger(__name__)
 
 

lms/djangoapps/commerce/signals.py

@@ -14,13 +14,14 @@ from django.contrib.auth.models import AnonymousUser
 from django.dispatch import receiver
 from django.utils.translation import ugettext as _
 
-from .models import CommerceConfiguration
 from openedx.core.djangoapps.commerce.utils import ecommerce_api_client, is_commerce_service_configured
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.theming import helpers as theming_helpers
 from request_cache.middleware import RequestCache
 from student.signals import REFUND_ORDER
 
+from .models import CommerceConfiguration
+
 log = logging.getLogger(__name__)
 
 

lms/djangoapps/commerce/tests/test_signals.py

@@ -19,17 +19,14 @@ from opaque_keys.edx.keys import CourseKey
 from requests import Timeout
 
 from course_modes.models import CourseMode
-from ..models import CommerceConfiguration
-from ..signals import (
-    create_zendesk_ticket,
-    generate_refund_notification_body,
-    send_refund_notification
-)
-from . import JSON
-from .mocks import mock_create_refund, mock_process_refund
 from student.signals import REFUND_ORDER
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
 
+from . import JSON
+from ..models import CommerceConfiguration
+from ..signals import create_zendesk_ticket, generate_refund_notification_body, send_refund_notification
+from .mocks import mock_create_refund, mock_process_refund
+
 ZENDESK_URL = 'http://zendesk.example.com/'
 ZENDESK_USER = 'test@example.com'
 ZENDESK_API_KEY = 'abc123'

lms/djangoapps/commerce/tests/test_utils.py

@@ -9,11 +9,12 @@ from django.test.utils import override_settings
 from mock import patch
 from waffle.testutils import override_switch
 
-from ..models import CommerceConfiguration
-from ..utils import EcommerceService
 from openedx.core.lib.log_utils import audit_log
 from student.tests.factories import UserFactory
 
+from ..models import CommerceConfiguration
+from ..utils import EcommerceService
+
 
 def update_commerce_config(enabled=False, checkout_page='/test_basket/'):
     """ Enable / Disable CommerceConfiguration model """

lms/djangoapps/commerce/utils.py

@@ -5,10 +5,11 @@ from urlparse import urljoin
 import waffle
 from django.conf import settings
 from django.core.urlresolvers import reverse
+
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from student.models import CourseEnrollment
 
 from .models import CommerceConfiguration
-from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 
 
 def is_account_activation_requirement_disabled():

lms/djangoapps/commerce/views.py

@@ -12,7 +12,6 @@ from opaque_keys.edx.locator import CourseLocator
 
 from course_modes.models import CourseMode
 from edxmako.shortcuts import render_to_response
-from .models import CommerceConfiguration
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.theming.helpers import is_request_in_themed_site
@@ -20,6 +19,8 @@ from shoppingcart.processors.CyberSource2 import is_user_payment_error
 from student.models import CourseEnrollment
 from util.json_request import JsonResponse
 
+from .models import CommerceConfiguration
+
 log = logging.getLogger(__name__)
 
 

lms/djangoapps/courseware/tests/test_date_summary.py

@@ -12,23 +12,23 @@ from mock import patch
 from nose.plugins.attrib import attr
 from pytz import utc
 
-from lms.djangoapps.commerce.models import CommerceConfiguration
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
 from courseware.courses import get_course_date_blocks
 from courseware.date_summary import (
+    CertificateAvailableDate,
     CourseEndDate,
     CourseStartDate,
     TodaysDate,
     VerificationDeadlineDate,
-    VerifiedUpgradeDeadlineDate,
-    CertificateAvailableDate
+    VerifiedUpgradeDeadlineDate
 )
 from courseware.models import (
     CourseDynamicUpgradeDeadlineConfiguration,
     DynamicUpgradeDeadlineConfiguration,
     OrgDynamicUpgradeDeadlineConfiguration
 )
+from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.verify_student.models import VerificationDeadline
 from lms.djangoapps.verify_student.tests.factories import SoftwareSecurePhotoVerificationFactory
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
@@ -38,8 +38,8 @@ from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
 from openedx.core.djangoapps.user_api.preferences.api import set_user_preference
 from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag
-from openedx.features.course_experience import CourseHomeMessages, UNIFIED_COURSE_TAB_FLAG, UPGRADE_DEADLINE_MESSAGE
-from student.tests.factories import CourseEnrollmentFactory, UserFactory, TEST_PASSWORD
+from openedx.features.course_experience import UNIFIED_COURSE_TAB_FLAG, UPGRADE_DEADLINE_MESSAGE, CourseHomeMessages
+from student.tests.factories import TEST_PASSWORD, CourseEnrollmentFactory, UserFactory
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 

lms/djangoapps/courseware/tests/test_views.py

@@ -35,7 +35,6 @@ from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
 from certificates import api as certs_api
 from certificates.models import CertificateGenerationConfiguration, CertificateStatuses
 from certificates.tests.factories import CertificateInvalidationFactory, GeneratedCertificateFactory
-from lms.djangoapps.commerce.models import CommerceConfiguration
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
 from courseware.access_utils import check_course_open_for_learner
@@ -45,6 +44,7 @@ from courseware.tests.factories import GlobalStaffFactory, StudentModuleFactory
 from courseware.testutils import RenderXBlockTestMixin
 from courseware.url_helpers import get_redirect_url
 from courseware.user_state_client import DjangoXBlockUserStateClient
+from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.commerce.utils import EcommerceService  # pylint: disable=import-error
 from lms.djangoapps.grades.config.waffle import waffle as grades_waffle
 from lms.djangoapps.grades.config.waffle import ASSUME_ZERO_GRADE_IF_ABSENT

lms/djangoapps/courseware/views/views.py

@@ -8,12 +8,38 @@ from collections import OrderedDict, namedtuple
 from datetime import datetime
 
 import analytics
+from django.conf import settings
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import AnonymousUser, User
+from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
+from django.db import transaction
+from django.db.models import Q
+from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, QueryDict
+from django.shortcuts import redirect
+from django.template.context_processors import csrf
+from django.utils.decorators import method_decorator
+from django.utils.http import urlquote_plus
+from django.utils.text import slugify
+from django.utils.translation import ugettext as _
+from django.views.decorators.cache import cache_control
+from django.views.decorators.csrf import ensure_csrf_cookie
+from django.views.decorators.http import require_GET, require_http_methods, require_POST
+from django.views.generic import View
+from eventtracking import tracker
+from ipware.ip import get_ip
+from markupsafe import escape
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import CourseKey, UsageKey
+from pytz import UTC
+from rest_framework import status
+from web_fragments.fragment import Fragment
+
 import shoppingcart
 import survey.views
 from certificates import api as certs_api
 from certificates.models import CertificateStatuses
-from lms.djangoapps.commerce.utils import EcommerceService
-from course_modes.models import (CourseMode, get_course_prices)
+from course_modes.models import CourseMode, get_course_prices
 from courseware.access import has_access, has_ccx_coach_role
 from courseware.access_utils import check_course_open_for_learner
 from courseware.courses import (
@@ -34,47 +60,24 @@ from courseware.model_data import FieldDataCache
 from courseware.models import BaseStudentModuleHistory, StudentModule
 from courseware.url_helpers import get_redirect_url
 from courseware.user_state_client import DjangoXBlockUserStateClient
-from django.conf import settings
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import AnonymousUser, User
-from django.template.context_processors import csrf
-from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
-from django.db import transaction
-from django.db.models import Q
-from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, QueryDict
-from django.shortcuts import redirect
-from django.utils.decorators import method_decorator
-from django.utils.http import urlquote_plus
-from django.utils.text import slugify
-from pytz import UTC
-from django.utils.translation import ugettext as _
-from django.views.decorators.cache import cache_control
-from django.views.decorators.csrf import ensure_csrf_cookie
-from django.views.decorators.http import require_GET, require_http_methods, require_POST
-from django.views.generic import View
 from edxmako.shortcuts import marketing_link, render_to_response, render_to_string
 from enrollment.api import add_enrollment
-from eventtracking import tracker
-from ipware.ip import get_ip
 from lms.djangoapps.ccx.custom_exception import CCXLocatorValidationException
+from lms.djangoapps.commerce.utils import EcommerceService
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect, Redirect
 from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
 from lms.djangoapps.grades.course_grade_factory import CourseGradeFactory
 from lms.djangoapps.instructor.enrollment import uses_shib
 from lms.djangoapps.instructor.views.api import require_global_staff
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
-from markupsafe import escape
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import CourseKey, UsageKey
 from openedx.core.djangoapps.catalog.utils import get_programs, get_programs_with_type
+from openedx.core.djangoapps.certificates import api as auto_certs_api
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.credit.api import (
     get_credit_requirement_status,
     is_credit_course,
     is_user_eligible_for_credit
 )
-from openedx.core.djangoapps.certificates import api as auto_certs_api
 from openedx.core.djangoapps.models.course_details import CourseDetails
 from openedx.core.djangoapps.monitoring_utils import set_custom_metrics_for_course_key
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
@@ -87,14 +90,12 @@ from openedx.features.course_experience import UNIFIED_COURSE_TAB_FLAG, course_h
 from openedx.features.course_experience.course_tools import CourseToolsPluginManager
 from openedx.features.course_experience.views.course_dates import CourseDatesFragmentView
 from openedx.features.enterprise_support.api import data_sharing_consent_required
-from rest_framework import status
 from shoppingcart.utils import is_shopping_cart_enabled
 from student.models import CourseEnrollment, UserTestGroup
 from util.cache import cache, cache_if_anonymous
 from util.db import outer_atomic
 from util.milestones_helpers import get_prerequisite_courses_display
 from util.views import _record_feedback_in_zendesk, ensure_valid_course_key, ensure_valid_usage_key
-from web_fragments.fragment import Fragment
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
 from xmodule.tabs import CourseTabList

lms/djangoapps/instructor/services.py

@@ -10,8 +10,8 @@ from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, UsageKey
 
 import lms.djangoapps.instructor.enrollment as enrollment
-from lms.djangoapps.commerce.signals import create_zendesk_ticket
 from courseware.models import StudentModule
+from lms.djangoapps.commerce.signals import create_zendesk_ticket
 from lms.djangoapps.instructor.views.tools import get_student_from_identifier
 from student import auth
 from student.roles import CourseStaffRole

lms/djangoapps/student_account/test/test_views.py

@@ -20,6 +20,7 @@ from django.test import TestCase
 from django.test.utils import override_settings
 from edx_oauth2_provider.tests.factories import AccessTokenFactory, ClientFactory, RefreshTokenFactory
 from edx_rest_api_client import exceptions
+from http.cookies import SimpleCookie
 from nose.plugins.attrib import attr
 from oauth2_provider.models import AccessToken as dot_access_token
 from oauth2_provider.models import RefreshToken as dot_refresh_token
@@ -27,11 +28,10 @@ from provider.oauth2.models import AccessToken as dop_access_token
 from provider.oauth2.models import RefreshToken as dop_refresh_token
 from testfixtures import LogCapture
 
+from course_modes.models import CourseMode
 from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.commerce.tests import factories
 from lms.djangoapps.commerce.tests.mocks import mock_get_orders
-from course_modes.models import CourseMode
-from http.cookies import SimpleCookie
 from openedx.core.djangoapps.oauth_dispatch.tests import factories as dot_factories
 from openedx.core.djangoapps.programs.tests.mixins import ProgramsApiConfigMixin
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin

lms/djangoapps/student_account/views.py

@@ -18,8 +18,8 @@ from django.views.decorators.http import require_http_methods
 from django_countries import countries
 
 import third_party_auth
-from lms.djangoapps.commerce.models import CommerceConfiguration
 from edxmako.shortcuts import render_to_response
+from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.commerce.utils import EcommerceService
 from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
 from openedx.core.djangoapps.external_auth.login_and_register import login as external_auth_login

lms/djangoapps/verify_student/tests/test_views.py

@@ -28,14 +28,14 @@ from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import CourseLocator
 from waffle.testutils import override_switch
 
-from lms.djangoapps.commerce.models import CommerceConfiguration
-from lms.djangoapps.commerce.tests import TEST_API_URL, TEST_PAYMENT_DATA, TEST_PUBLIC_URL_ROOT
 from common.test.utils import XssTestMixin
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
+from lms.djangoapps.commerce.models import CommerceConfiguration
+from lms.djangoapps.commerce.tests import TEST_API_URL, TEST_PAYMENT_DATA, TEST_PUBLIC_URL_ROOT
+from lms.djangoapps.commerce.utils import EcommerceService
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationDeadline
 from lms.djangoapps.verify_student.views import PayAndVerifyView, checkout_with_ecommerce_service, render_to_response
-from lms.djangoapps.commerce.utils import EcommerceService
 from openedx.core.djangoapps.embargo.test_utils import restrict_course
 from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme
 from openedx.core.djangoapps.user_api.accounts.api import get_account_settings

lms/djangoapps/verify_student/views.py

@@ -25,15 +25,15 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
 from django.views.generic.base import View
 from edx_rest_api_client.exceptions import SlumberBaseException
+from eventtracking import tracker
 from ipware.ip import get_ip
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from pytz import UTC
 
-from lms.djangoapps.commerce.utils import EcommerceService, is_account_activation_requirement_disabled
 from course_modes.models import CourseMode
 from edxmako.shortcuts import render_to_response, render_to_string
-from eventtracking import tracker
+from lms.djangoapps.commerce.utils import EcommerceService, is_account_activation_requirement_disabled
 from lms.djangoapps.verify_student.image import InvalidImageData, decode_image_data
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationDeadline
 from lms.djangoapps.verify_student.ssencrypt import has_valid_signature

openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py

-from collections import namedtuple, defaultdict
-from copy import deepcopy
 import datetime
-import ddt
 import logging
+from collections import defaultdict, namedtuple
+from copy import deepcopy
 
 import attr
+import ddt
+import pytz
 from django.conf import settings
+from edx_ace.channel import ChannelType
+from edx_ace.test_utils import StubPolicy, patch_channels, patch_policies
+from edx_ace.utils.date import serialize
 from freezegun import freeze_time
 from mock import Mock, patch
-import pytz
+from opaque_keys.edx.keys import CourseKey
 
-from lms.djangoapps.commerce.models import CommerceConfiguration
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
 from courseware.models import DynamicUpgradeDeadlineConfiguration
-from edx_ace.channel import ChannelType
-from edx_ace.utils.date import serialize
-from edx_ace.test_utils import StubPolicy, patch_channels, patch_policies
-from opaque_keys.edx.keys import CourseKey
-from openedx.core.djangoapps.site_configuration.tests.factories import SiteConfigurationFactory, SiteFactory
+from lms.djangoapps.commerce.models import CommerceConfiguration
 from openedx.core.djangoapps.schedules import resolvers, tasks
 from openedx.core.djangoapps.schedules.resolvers import _get_datetime_beginning_of_day
 from openedx.core.djangoapps.schedules.tests.factories import ScheduleConfigFactory, ScheduleFactory
+from openedx.core.djangoapps.site_configuration.tests.factories import SiteConfigurationFactory, SiteFactory
 from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES
-from openedx.core.djangolib.testing.utils import FilteredQueryCountMixin, CacheIsolationTestCase
+from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, FilteredQueryCountMixin
 from student.models import CourseEnrollment
 from student.tests.factories import UserFactory
 
-
 SITE_QUERY = 1  # django_site
 SITE_CONFIG_QUERY = 1  # site_configuration_siteconfiguration
 

openedx/features/course_experience/tests/views/test_course_home.py

@@ -14,11 +14,11 @@ from pytz import UTC
 from waffle.models import Flag
 from waffle.testutils import override_flag
 
+from course_modes.models import CourseMode
+from courseware.tests.factories import StaffFactory
 from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.commerce.utils import EcommerceService
 from lms.djangoapps.course_goals.api import add_course_goal, remove_course_goal
-from course_modes.models import CourseMode
-from courseware.tests.factories import StaffFactory
 from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES, override_waffle_flag
 from openedx.features.course_experience import (
     SHOW_REVIEWS_TOOL_FLAG,
@@ -26,14 +26,15 @@ from openedx.features.course_experience import (
     UNIFIED_COURSE_TAB_FLAG
 )
 from student.models import CourseEnrollment
-from student.tests.factories import UserFactory, CourseEnrollmentFactory
+from student.tests.factories import CourseEnrollmentFactory, UserFactory
 from util.date_utils import strftime_localized
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.tests.django_utils import CourseUserType, ModuleStoreTestCase, SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, check_mongo_calls
+
+from ... import COURSE_PRE_START_ACCESS_FLAG, ENABLE_COURSE_GOALS
 from .helpers import add_course_mode
 from .test_course_updates import create_course_update, remove_course_updates
-from ... import COURSE_PRE_START_ACCESS_FLAG, ENABLE_COURSE_GOALS
 
 TEST_PASSWORD = 'test'
 TEST_CHAPTER_NAME = 'Test Chapter'

openedx/features/course_experience/tests/views/test_course_sock.py

@@ -4,11 +4,11 @@ Tests for course verification sock
 
 import ddt
 
-from lms.djangoapps.commerce.models import CommerceConfiguration
 from course_modes.models import CourseMode
+from lms.djangoapps.commerce.models import CommerceConfiguration
 from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag
 from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
-from student.tests.factories import UserFactory, CourseEnrollmentFactory
+from student.tests.factories import CourseEnrollmentFactory, UserFactory
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 

openedx/features/course_experience/views/course_home.py

@@ -2,30 +2,31 @@
 Views for the course home page.
 """
 
-from django.template.context_processors import csrf
 from django.core.urlresolvers import reverse
+from django.template.context_processors import csrf
 from django.template.loader import render_to_string
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_control
 from django.views.decorators.csrf import ensure_csrf_cookie
+from opaque_keys.edx.keys import CourseKey
+from web_fragments.fragment import Fragment
 
-from lms.djangoapps.commerce.utils import EcommerceService
 from course_modes.models import get_cosmetic_verified_display_price
 from courseware.access import has_access
-from courseware.courses import (
-    can_self_enroll_in_course,
-    get_course_info_section,
-    get_course_with_access,
+from courseware.courses import can_self_enroll_in_course, get_course_info_section, get_course_with_access
+from lms.djangoapps.commerce.utils import EcommerceService
+from lms.djangoapps.course_goals.api import (
+    get_course_goal,
+    get_course_goal_options,
+    get_goal_api_url,
+    has_course_goal_permission
 )
-from lms.djangoapps.course_goals.api import get_course_goal, has_course_goal_permission, get_course_goal_options, get_goal_api_url
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect
 from lms.djangoapps.courseware.views.views import CourseTabView
-from opaque_keys.edx.keys import CourseKey
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 from openedx.features.course_experience.course_tools import CourseToolsPluginManager
 from student.models import CourseEnrollment
 from util.views import ensure_valid_course_key
-from web_fragments.fragment import Fragment
 
 from .. import LATEST_UPDATE_FLAG, SHOW_UPGRADE_MSG_ON_COURSE_HOME, USE_BOOTSTRAP_FLAG
 from ..utils import get_course_outline_block_tree