Call isort on the codebase.

I don't know how this wasn't caught in tests?
Anyway, running `make quality` locally lead to issues,
so I had to call isort on the codebase.

course_discovery/apps/api/utils.py

 import hashlib
 import logging
+
 import six
 
 logger = logging.getLogger(__name__)

course_discovery/apps/api/v1/tests/test_views/test_courses.py

@@ -2,7 +2,6 @@ import datetime
 
 import ddt
 import pytz
-
 from django.core.cache import cache
 from django.db.models.functions import Lower
 from rest_framework.reverse import reverse

course_discovery/apps/api/v1/views/__init__.py

-from django.conf import settings
 from django.contrib.auth import get_user_model
 
 from course_discovery.apps.api import serializers
-from course_discovery.apps.api.exceptions import InvalidPartnerError
-from course_discovery.apps.core.models import Partner
 
 User = get_user_model()
 

course_discovery/apps/core/migrations/0007_auto_20171004_1133.py

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 
 from django.db import migrations
 
-
 SWITCH = 'use_company_name_as_utm_source_value'
 
 

course_discovery/apps/core/tests/mixins.py

@@ -3,7 +3,6 @@ import logging
 
 import pytest
 import responses
-
 from django.conf import settings
 from haystack import connections as haystack_connections
 

course_discovery/apps/course_metadata/models.py

@@ -26,15 +26,13 @@ from taggit_autosuggest.managers import TaggableManager
 from course_discovery.apps.core.models import Currency, Partner
 from course_discovery.apps.course_metadata.choices import CourseRunPacing, CourseRunStatus, ProgramStatus, ReportingType
 from course_discovery.apps.course_metadata.publishers import (
-    CourseRunMarketingSitePublisher,
-    ProgramMarketingSitePublisher
+    CourseRunMarketingSitePublisher, ProgramMarketingSitePublisher
 )
 from course_discovery.apps.course_metadata.query import CourseQuerySet, CourseRunQuerySet, ProgramQuerySet
 from course_discovery.apps.course_metadata.utils import UploadToFieldNamePath, clean_query, custom_render_variations
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
 from course_discovery.apps.publisher.utils import VALID_CHARS_IN_COURSE_NUM_AND_ORG_KEY
 
-
 logger = logging.getLogger(__name__)
 
 

course_discovery/apps/course_metadata/publishers.py

@@ -8,12 +8,7 @@ from django.utils.text import slugify
 
 from course_discovery.apps.course_metadata.choices import CourseRunStatus
 from course_discovery.apps.course_metadata.exceptions import (
-    AliasCreateError,
-    AliasDeleteError,
-    FormRetrievalError,
-    NodeCreateError,
-    NodeDeleteError,
-    NodeEditError,
+    AliasCreateError, AliasDeleteError, FormRetrievalError, NodeCreateError, NodeDeleteError, NodeEditError,
     NodeLookupError
 )
 from course_discovery.apps.course_metadata.utils import MarketingSiteAPIClient

course_discovery/apps/course_metadata/tests/test_publishers.py

@@ -7,18 +7,11 @@ import responses
 from course_discovery.apps.core.tests.factories import PartnerFactory
 from course_discovery.apps.course_metadata.choices import CourseRunStatus, ProgramStatus
 from course_discovery.apps.course_metadata.exceptions import (
-    AliasCreateError,
-    AliasDeleteError,
-    FormRetrievalError,
-    NodeCreateError,
-    NodeDeleteError,
-    NodeEditError,
+    AliasCreateError, AliasDeleteError, FormRetrievalError, NodeCreateError, NodeDeleteError, NodeEditError,
     NodeLookupError
 )
 from course_discovery.apps.course_metadata.publishers import (
-    BaseMarketingSitePublisher,
-    CourseRunMarketingSitePublisher,
-    ProgramMarketingSitePublisher
+    BaseMarketingSitePublisher, CourseRunMarketingSitePublisher, ProgramMarketingSitePublisher
 )
 from course_discovery.apps.course_metadata.tests import toggle_switch
 from course_discovery.apps.course_metadata.tests.factories import CourseRunFactory, ProgramFactory

course_discovery/apps/edx_haystack_extensions/distinct_counts/backends.py

 import elasticsearch
-
 from django.conf import settings
 from haystack.backends.elasticsearch_backend import ElasticsearchSearchQuery
 from haystack.models import SearchResult

course_discovery/apps/edx_haystack_extensions/distinct_counts/query.py

 from django.conf import settings
 from haystack.query import SearchQuerySet
+
 from course_discovery.apps.edx_haystack_extensions.distinct_counts.backends import DistinctCountsSearchQuery
 
 

course_discovery/apps/edx_haystack_extensions/management/commands/remove_unused_indexes.py

@@ -4,7 +4,6 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from haystack import connections as haystack_connections
 
-
 logger = logging.getLogger(__name__)
 
 

course_discovery/apps/publisher/admin.py

@@ -6,16 +6,18 @@ from simple_history.admin import SimpleHistoryAdmin
 
 from course_discovery.apps.publisher.assign_permissions import assign_permissions
 from course_discovery.apps.publisher.choices import InternalUserRole
-from course_discovery.apps.publisher.constants import (INTERNAL_USER_GROUP_NAME, PARTNER_MANAGER_GROUP_NAME,
-                                                       PROJECT_COORDINATOR_GROUP_NAME, PUBLISHER_GROUP_NAME,
-                                                       REVIEWER_GROUP_NAME)
+from course_discovery.apps.publisher.constants import (
+    INTERNAL_USER_GROUP_NAME, PARTNER_MANAGER_GROUP_NAME, PROJECT_COORDINATOR_GROUP_NAME, PUBLISHER_GROUP_NAME,
+    REVIEWER_GROUP_NAME
+)
 from course_discovery.apps.publisher.forms import (
     CourseRunAdminForm, CourseRunStateAdminForm, CourseStateAdminForm, OrganizationExtensionForm,
     PublisherUserCreationForm, UserAttributesAdminForm
 )
-from course_discovery.apps.publisher.models import (Course, CourseEntitlement, CourseRun, CourseRunState, CourseState,
-                                                    CourseUserRole, OrganizationExtension, OrganizationUserRole,
-                                                    PublisherUser, Seat, UserAttributes)
+from course_discovery.apps.publisher.models import (
+    Course, CourseEntitlement, CourseRun, CourseRunState, CourseState, CourseUserRole, OrganizationExtension,
+    OrganizationUserRole, PublisherUser, Seat, UserAttributes
+)
 
 
 @admin.register(CourseUserRole)

course_discovery/apps/publisher/api/serializers.py

@@ -13,9 +13,10 @@ from rest_framework import serializers
 
 from course_discovery.apps.core.models import User
 from course_discovery.apps.publisher.choices import PublisherUserRole
-from course_discovery.apps.publisher.emails import (send_change_role_assignment_email,
-                                                    send_email_for_studio_instance_created, send_email_preview_accepted,
-                                                    send_email_preview_page_is_available)
+from course_discovery.apps.publisher.emails import (
+    send_change_role_assignment_email, send_email_for_studio_instance_created, send_email_preview_accepted,
+    send_email_preview_page_is_available
+)
 from course_discovery.apps.publisher.models import CourseRun, CourseRunState, CourseState, CourseUserRole
 
 

course_discovery/apps/publisher/api/tests/test_serializers.py

@@ -11,14 +11,16 @@ from course_discovery.apps.core.tests.helpers import make_image_file
 from course_discovery.apps.course_metadata.tests import toggle_switch
 from course_discovery.apps.course_metadata.tests.factories import OrganizationFactory, PersonFactory
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
-from course_discovery.apps.publisher.api.serializers import (CourseRevisionSerializer, CourseRunSerializer,
-                                                             CourseRunStateSerializer, CourseStateSerializer,
-                                                             CourseUserRoleSerializer, GroupUserSerializer)
+from course_discovery.apps.publisher.api.serializers import (
+    CourseRevisionSerializer, CourseRunSerializer, CourseRunStateSerializer, CourseStateSerializer,
+    CourseUserRoleSerializer, GroupUserSerializer
+)
 from course_discovery.apps.publisher.choices import CourseRunStateChoices, CourseStateChoices, PublisherUserRole
 from course_discovery.apps.publisher.models import CourseRun, CourseState, Seat
-from course_discovery.apps.publisher.tests.factories import (CourseFactory, CourseRunFactory, CourseRunStateFactory,
-                                                             CourseStateFactory, CourseUserRoleFactory,
-                                                             OrganizationExtensionFactory, SeatFactory)
+from course_discovery.apps.publisher.tests.factories import (
+    CourseFactory, CourseRunFactory, CourseRunStateFactory, CourseStateFactory, CourseUserRoleFactory,
+    OrganizationExtensionFactory, SeatFactory
+)
 
 
 class CourseUserRoleSerializerTests(SiteMixin, TestCase):

course_discovery/apps/publisher/api/tests/test_utils.py

 import pytest
 
 from course_discovery.apps.core.utils import serialize_datetime
-from course_discovery.apps.publisher.api.utils import (serialize_entitlement_for_ecommerce_api,
-                                                       serialize_seat_for_ecommerce_api)
+from course_discovery.apps.publisher.api.utils import (
+    serialize_entitlement_for_ecommerce_api, serialize_seat_for_ecommerce_api
+)
 from course_discovery.apps.publisher.models import Seat
 from course_discovery.apps.publisher.tests.factories import CourseEntitlementFactory, SeatFactory
 

course_discovery/apps/publisher/api/tests/test_views.py

@@ -22,8 +22,9 @@ from course_discovery.apps.ietf_language_tags.models import LanguageTag
 from course_discovery.apps.publisher.api import views
 from course_discovery.apps.publisher.choices import CourseRunStateChoices, CourseStateChoices, PublisherUserRole
 from course_discovery.apps.publisher.constants import ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME
-from course_discovery.apps.publisher.models import (Course, CourseRun, CourseRunState, CourseState,
-                                                    OrganizationExtension, Seat)
+from course_discovery.apps.publisher.models import (
+    Course, CourseRun, CourseRunState, CourseState, OrganizationExtension, Seat
+)
 from course_discovery.apps.publisher.tests import JSON_CONTENT_TYPE, factories
 
 

course_discovery/apps/publisher/api/urls.py

 """ Publisher API URLs. """
 from django.conf.urls import include, url
 
-from course_discovery.apps.publisher.api.views import (AcceptAllRevisionView, ChangeCourseRunStateView,
-                                                       ChangeCourseStateView, CourseRevisionDetailView,
-                                                       CourseRoleAssignmentView, CoursesAutoComplete,
-                                                       OrganizationGroupUserView, RevertCourseRevisionView,
-                                                       UpdateCourseRunView)
+from course_discovery.apps.publisher.api.views import (
+    AcceptAllRevisionView, ChangeCourseRunStateView, ChangeCourseStateView, CourseRevisionDetailView,
+    CourseRoleAssignmentView, CoursesAutoComplete, OrganizationGroupUserView, RevertCourseRevisionView,
+    UpdateCourseRunView
+)
 
 urlpatterns = [
     url(r'^course_role_assignments/(?P<pk>\d+)/$', CourseRoleAssignmentView.as_view(), name='course_role_assignments'),

course_discovery/apps/publisher/api/v1/tests/test_views.py

@@ -18,8 +18,9 @@ from course_discovery.apps.course_metadata.models import Seat as DiscoverySeat
 from course_discovery.apps.course_metadata.models import CourseRun, SeatType, Video
 from course_discovery.apps.course_metadata.tests.factories import OrganizationFactory, PersonFactory
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
-from course_discovery.apps.publisher.api.utils import (serialize_entitlement_for_ecommerce_api,
-                                                       serialize_seat_for_ecommerce_api)
+from course_discovery.apps.publisher.api.utils import (
+    serialize_entitlement_for_ecommerce_api, serialize_seat_for_ecommerce_api
+)
 from course_discovery.apps.publisher.api.v1.views import CourseRunViewSet
 from course_discovery.apps.publisher.models import CourseEntitlement, Seat
 from course_discovery.apps.publisher.tests.factories import CourseEntitlementFactory, CourseRunFactory, SeatFactory

course_discovery/apps/publisher/api/views.py

@@ -11,14 +11,17 @@ from rest_framework.views import APIView
 
 from course_discovery.apps.core.models import User
 from course_discovery.apps.publisher.api.paginations import LargeResultsSetPagination
-from course_discovery.apps.publisher.api.permissions import (CanViewAssociatedCourse, InternalUserPermission,
-                                                             PublisherUserPermission)
-from course_discovery.apps.publisher.api.serializers import (CourseRevisionSerializer, CourseRunSerializer,
-                                                             CourseRunStateSerializer, CourseStateSerializer,
-                                                             CourseUserRoleSerializer, GroupUserSerializer)
+from course_discovery.apps.publisher.api.permissions import (
+    CanViewAssociatedCourse, InternalUserPermission, PublisherUserPermission
+)
+from course_discovery.apps.publisher.api.serializers import (
+    CourseRevisionSerializer, CourseRunSerializer, CourseRunStateSerializer, CourseStateSerializer,
+    CourseUserRoleSerializer, GroupUserSerializer
+)
 from course_discovery.apps.publisher.forms import CourseForm
-from course_discovery.apps.publisher.models import (Course, CourseRun, CourseRunState, CourseState, CourseUserRole,
-                                                    OrganizationExtension, PublisherUser)
+from course_discovery.apps.publisher.models import (
+    Course, CourseRun, CourseRunState, CourseState, CourseUserRole, OrganizationExtension, PublisherUser
+)
 
 logger = logging.getLogger(__name__)
 

course_discovery/apps/publisher/assign_permissions.py

 from django.contrib.auth.models import Group
 from guardian.shortcuts import assign_perm
 
-from course_discovery.apps.publisher.constants import (GENERAL_STAFF_GROUP_NAME, LEGAL_TEAM_GROUP_NAME,
-                                                       PARTNER_SUPPORT_GROUP_NAME, PROJECT_COORDINATOR_GROUP_NAME,
-                                                       REVIEWER_GROUP_NAME)
+from course_discovery.apps.publisher.constants import (
+    GENERAL_STAFF_GROUP_NAME, LEGAL_TEAM_GROUP_NAME, PARTNER_SUPPORT_GROUP_NAME, PROJECT_COORDINATOR_GROUP_NAME,
+    REVIEWER_GROUP_NAME
+)
 from course_discovery.apps.publisher.models import OrganizationExtension
 
 

course_discovery/apps/publisher/migrations/0019_create_user_groups.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 
 from django.db import migrations
 
-from course_discovery.apps.publisher.constants import (PARTNER_COORDINATOR_GROUP_NAME, PUBLISHER_GROUP_NAME,
-                                                       REVIEWER_GROUP_NAME)
+from course_discovery.apps.publisher.constants import (
+    PARTNER_COORDINATOR_GROUP_NAME, PUBLISHER_GROUP_NAME, REVIEWER_GROUP_NAME
+)
 
 GROUPS = [PARTNER_COORDINATOR_GROUP_NAME, REVIEWER_GROUP_NAME, PUBLISHER_GROUP_NAME]
 

course_discovery/apps/publisher/migrations/0061_add_people_permission.py

@@ -4,8 +4,10 @@ from __future__ import unicode_literals
 
 from django.db import migrations
 
-from course_discovery.apps.publisher.constants import (INTERNAL_USER_GROUP_NAME, PARTNER_COORDINATOR_GROUP_NAME,
-                                                       PUBLISHER_GROUP_NAME, REVIEWER_GROUP_NAME)
+from course_discovery.apps.publisher.constants import (
+    INTERNAL_USER_GROUP_NAME, PARTNER_COORDINATOR_GROUP_NAME, PUBLISHER_GROUP_NAME, REVIEWER_GROUP_NAME
+)
+
 GROUPS = [INTERNAL_USER_GROUP_NAME, PARTNER_COORDINATOR_GROUP_NAME, REVIEWER_GROUP_NAME, PUBLISHER_GROUP_NAME]
 
 

course_discovery/apps/publisher/models.py

@@ -29,7 +29,6 @@ from course_discovery.apps.publisher.choices import (
     CourseRunStateChoices, CourseStateChoices, InternalUserRole, PublisherUserRole
 )
 from course_discovery.apps.publisher.utils import is_email_notification_enabled, is_internal_user, is_publisher_admin
-
 from course_discovery.apps.publisher.validators import ImageMultiSizeValidator
 
 logger = logging.getLogger(__name__)

course_discovery/apps/publisher/tests/factories.py

@@ -12,9 +12,10 @@ from course_discovery.apps.course_metadata.choices import CourseRunPacing
 from course_discovery.apps.course_metadata.tests import factories
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
 from course_discovery.apps.publisher.choices import PublisherUserRole
-from course_discovery.apps.publisher.models import (Course, CourseEntitlement, CourseRun, CourseRunState, CourseState,
-                                                    CourseUserRole, OrganizationExtension, OrganizationUserRole, Seat,
-                                                    UserAttributes)
+from course_discovery.apps.publisher.models import (
+    Course, CourseEntitlement, CourseRun, CourseRunState, CourseState, CourseUserRole, OrganizationExtension,
+    OrganizationUserRole, Seat, UserAttributes
+)
 
 
 class CourseFactory(factory.DjangoModelFactory):

course_discovery/apps/publisher/tests/test_admin.py

@@ -8,8 +8,9 @@ from course_discovery.apps.api.tests.mixins import SiteMixin
 from course_discovery.apps.core.tests.factories import UserFactory
 from course_discovery.apps.course_metadata.tests.factories import OrganizationFactory
 from course_discovery.apps.publisher.choices import PublisherUserRole
-from course_discovery.apps.publisher.constants import (PARTNER_MANAGER_GROUP_NAME, PROJECT_COORDINATOR_GROUP_NAME,
-                                                       PUBLISHER_GROUP_NAME, REVIEWER_GROUP_NAME)
+from course_discovery.apps.publisher.constants import (
+    PARTNER_MANAGER_GROUP_NAME, PROJECT_COORDINATOR_GROUP_NAME, PUBLISHER_GROUP_NAME, REVIEWER_GROUP_NAME
+)
 from course_discovery.apps.publisher.forms import CourseRunAdminForm
 from course_discovery.apps.publisher.models import CourseRun, OrganizationExtension
 from course_discovery.apps.publisher.tests import factories

course_discovery/apps/publisher/tests/test_models.py

@@ -16,8 +16,9 @@ from course_discovery.apps.course_metadata.tests.factories import OrganizationFa
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
 from course_discovery.apps.publisher.choices import CourseRunStateChoices, CourseStateChoices, PublisherUserRole
 from course_discovery.apps.publisher.mixins import check_course_organization_permission
-from course_discovery.apps.publisher.models import (Course, CourseUserRole, OrganizationExtension,
-                                                    OrganizationUserRole, Seat)
+from course_discovery.apps.publisher.models import (
+    Course, CourseUserRole, OrganizationExtension, OrganizationUserRole, Seat
+)
 from course_discovery.apps.publisher.tests import factories
 
 

course_discovery/apps/publisher/tests/test_utils.py

@@ -9,16 +9,18 @@ from guardian.shortcuts import assign_perm
 from mock import Mock
 
 from course_discovery.apps.core.tests.factories import UserFactory
-from course_discovery.apps.publisher.constants import (ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME,
-                                                       PROJECT_COORDINATOR_GROUP_NAME, REVIEWER_GROUP_NAME)
-from course_discovery.apps.publisher.mixins import (check_course_organization_permission, check_roles_access,
-                                                    publisher_user_required)
+from course_discovery.apps.publisher.constants import (
+    ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME, PROJECT_COORDINATOR_GROUP_NAME, REVIEWER_GROUP_NAME
+)
+from course_discovery.apps.publisher.mixins import (
+    check_course_organization_permission, check_roles_access, publisher_user_required
+)
 from course_discovery.apps.publisher.models import OrganizationExtension
 from course_discovery.apps.publisher.tests import factories
-from course_discovery.apps.publisher.utils import (get_internal_users, has_role_for_course,
-                                                   is_email_notification_enabled, is_internal_user,
-                                                   is_project_coordinator_user, is_publisher_admin, is_publisher_user,
-                                                   make_bread_crumbs, parse_datetime_field)
+from course_discovery.apps.publisher.utils import (
+    get_internal_users, has_role_for_course, is_email_notification_enabled, is_internal_user,
+    is_project_coordinator_user, is_publisher_admin, is_publisher_user, make_bread_crumbs, parse_datetime_field
+)
 
 
 @ddt.ddt

course_discovery/apps/publisher/tests/test_wrapper.py

@@ -6,8 +6,9 @@ import ddt
 from django.test import TestCase
 
 from course_discovery.apps.course_metadata.choices import CourseRunPacing
-from course_discovery.apps.course_metadata.tests.factories import (OrganizationFactory, PersonFactory,
-                                                                   PersonSocialNetworkFactory, PositionFactory)
+from course_discovery.apps.course_metadata.tests.factories import (
+    OrganizationFactory, PersonFactory, PersonSocialNetworkFactory, PositionFactory
+)
 from course_discovery.apps.publisher.choices import CourseRunStateChoices, PublisherUserRole
 from course_discovery.apps.publisher.models import Seat
 from course_discovery.apps.publisher.tests import factories

course_discovery/apps/publisher/utils.py

 """ Publisher Utils."""
 import re
+
 from dateutil import parser
 
 from course_discovery.apps.core.models import User
-from course_discovery.apps.publisher.constants import (ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME,
-                                                       PROJECT_COORDINATOR_GROUP_NAME)
+from course_discovery.apps.publisher.constants import (
+    ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME, PROJECT_COORDINATOR_GROUP_NAME
+)
 
 VALID_CHARS_IN_COURSE_NUM_AND_ORG_KEY = re.compile(r'^[a-zA-Z0-9._-]*$')
 

course_discovery/apps/publisher/views.py

@@ -32,8 +32,8 @@ from course_discovery.apps.publisher.forms import (
     AdminImportCourseForm, CourseEntitlementForm, CourseForm, CourseRunForm, CourseSearchForm, SeatForm
 )
 from course_discovery.apps.publisher.models import (
-    Course, CourseEntitlement, CourseRun, CourseRunState, CourseState, CourseUserRole,
-    OrganizationExtension, PublisherUser, Seat, UserAttributes
+    Course, CourseEntitlement, CourseRun, CourseRunState, CourseState, CourseUserRole, OrganizationExtension,
+    PublisherUser, Seat, UserAttributes
 )
 from course_discovery.apps.publisher.utils import (
     get_internal_users, has_role_for_course, is_internal_user, is_project_coordinator_user, is_publisher_admin,

course_discovery/apps/publisher_comments/models.py

 import logging
+
 import waffle
 from django.db import models, transaction
 from django.utils.translation import ugettext_lazy as _

course_discovery/apps/publisher_comments/urls.py

@@ -3,7 +3,6 @@ URLs for the course publisher comments views.
 """
 from django.conf.urls import include, url
 
-
 urlpatterns = [
     url(r'^api/', include('course_discovery.apps.publisher_comments.api.urls', namespace='api')),
 ]

course_discovery/settings/devstack_test.py

 from course_discovery.settings.devstack import *
+
 # noinspection PyUnresolvedReferences
 from course_discovery.settings.shared.test import *     # isort:skip