Re-ordered imports using isort

.isort.cfg

+[settings]
+line_length=120

acceptance_tests/affiliate_cookie_tests.py

@@ -5,8 +5,8 @@ from django.test import TestCase
 from selenium import webdriver
 
 from acceptance_tests.config import (
-    AFFILIATE_COOKIE_NAME, BASIC_AUTH_USERNAME, BASIC_AUTH_PASSWORD, COOKIE_DOMAIN, ECOMMERCE_URL_ROOT,
-    LMS_URL_ROOT, MARKETING_SITE_URL_ROOT
+    AFFILIATE_COOKIE_NAME, BASIC_AUTH_PASSWORD, BASIC_AUTH_USERNAME, COOKIE_DOMAIN, ECOMMERCE_URL_ROOT, LMS_URL_ROOT,
+    MARKETING_SITE_URL_ROOT
 )
 
 

acceptance_tests/test_api_gateway.py

 """ Tests to validate configuration of the API gateway. """
 import ddt
-from django.test import TestCase
 import requests
+from django.test import TestCase
 
-from acceptance_tests.config import API_GATEWAY_CATALOG_ROOT, API_ACCESS_TOKEN, CATALOG_ID
+from acceptance_tests.config import API_ACCESS_TOKEN, API_GATEWAY_CATALOG_ROOT, CATALOG_ID
 
 
 @ddt.ddt

course_discovery/apps/api/fields.py

 import base64
 
-from rest_framework import serializers
 from django.core.files.base import ContentFile
+from rest_framework import serializers
 
 
 class StdImageSerializerField(serializers.ImageField):

course_discovery/apps/api/filters.py

@@ -5,15 +5,16 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db.models import QuerySet
 from django.utils.translation import ugettext as _
-from drf_haystack.filters import HaystackFacetFilter, HaystackFilter as DefaultHaystackFilter
+from drf_haystack.filters import HaystackFilter as DefaultHaystackFilter
+from drf_haystack.filters import HaystackFacetFilter
 from drf_haystack.query import FacetQueryBuilder
 from dry_rest_permissions.generics import DRYPermissionFiltersBase
 from guardian.shortcuts import get_objects_for_user
-from rest_framework.exceptions import PermissionDenied, NotFound
+from rest_framework.exceptions import NotFound, PermissionDenied
 
 from course_discovery.apps.api.utils import cast2int
 from course_discovery.apps.core.models import Partner
-from course_discovery.apps.course_metadata.models import Course, CourseRun, Program, Organization
+from course_discovery.apps.course_metadata.models import Course, CourseRun, Organization, Program
 
 logger = logging.getLogger(__name__)
 User = get_user_model()

course_discovery/apps/api/pagination.py

-from rest_framework.pagination import (
-    PageNumberPagination as BasePageNumberPagination,
-    LimitOffsetPagination,
-)
+from rest_framework.pagination import PageNumberPagination as BasePageNumberPagination
+from rest_framework.pagination import LimitOffsetPagination
 
 
 class PageNumberPagination(BasePageNumberPagination):

course_discovery/apps/api/serializers.py

@@ -8,18 +8,17 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db.models.query import Prefetch
 from django.utils.translation import ugettext_lazy as _
-from drf_haystack.serializers import HaystackSerializer, HaystackFacetSerializer
+from drf_haystack.serializers import HaystackFacetSerializer, HaystackSerializer
 from rest_framework import serializers
 from rest_framework.fields import DictField
-from taggit_serializer.serializers import TagListSerializerField, TaggitSerializer
+from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
-from course_discovery.apps.api.fields import StdImageSerializerField, ImageField
+from course_discovery.apps.api.fields import ImageField, StdImageSerializerField
 from course_discovery.apps.catalogs.models import Catalog
 from course_discovery.apps.course_metadata.choices import CourseRunStatus, ProgramStatus
-from course_discovery.apps.course_metadata.models import (
-    Course, CourseRun, Image, Organization, Person, Prerequisite, Seat, Subject, Video, Program, ProgramType, FAQ,
-    CorporateEndorsement, Endorsement, Position, PersonWork
-)
+from course_discovery.apps.course_metadata.models import (FAQ, CorporateEndorsement, Course, CourseRun, Endorsement,
+                                                          Image, Organization, Person, PersonWork, Position,
+                                                          Prerequisite, Program, ProgramType, Seat, Subject, Video)
 from course_discovery.apps.course_metadata.search_indexes import CourseIndex, CourseRunIndex, ProgramIndex
 
 User = get_user_model()

course_discovery/apps/api/tests/jwt_utils.py

 """ Utilities for working with JWT during testing."""
 from time import time
 
-from django.conf import settings
 import jwt
+from django.conf import settings
 
 
 def generate_jwt_payload(user):

course_discovery/apps/api/tests/test_serializers.py

@@ -3,22 +3,22 @@ import datetime
 from urllib.parse import urlencode
 
 import ddt
+import pytz
 from django.test import TestCase
 from haystack.query import SearchQuerySet
 from opaque_keys.edx.keys import CourseKey
-import pytz
 from rest_framework.test import APIRequestFactory
 
 from course_discovery.apps.api.fields import ImageField, StdImageSerializerField
 from course_discovery.apps.api.serializers import (
-    CatalogSerializer, CourseRunSerializer, ContainedCoursesSerializer, ImageSerializer,
-    SubjectSerializer, PrerequisiteSerializer, VideoSerializer, OrganizationSerializer, SeatSerializer,
-    PersonSerializer, AffiliateWindowSerializer, ContainedCourseRunsSerializer, CourseRunSearchSerializer,
-    ProgramSerializer, ProgramSearchSerializer, MinimalProgramCourseSerializer, NestedProgramSerializer,
-    CourseRunWithProgramsSerializer, CourseWithProgramsSerializer, CorporateEndorsementSerializer,
-    FAQSerializer, EndorsementSerializer, PositionSerializer, FlattenedCourseRunWithCourseSerializer,
-    MinimalCourseSerializer, MinimalOrganizationSerializer, MinimalCourseRunSerializer, MinimalProgramSerializer,
-    CourseSerializer, TypeaheadCourseRunSearchSerializer, TypeaheadProgramSearchSerializer, ProgramTypeSerializer
+    AffiliateWindowSerializer, CatalogSerializer, ContainedCourseRunsSerializer, ContainedCoursesSerializer,
+    CorporateEndorsementSerializer, CourseRunSearchSerializer, CourseRunSerializer, CourseRunWithProgramsSerializer,
+    CourseSerializer, CourseWithProgramsSerializer, EndorsementSerializer, FAQSerializer,
+    FlattenedCourseRunWithCourseSerializer, ImageSerializer, MinimalCourseRunSerializer, MinimalCourseSerializer,
+    MinimalOrganizationSerializer, MinimalProgramCourseSerializer, MinimalProgramSerializer, NestedProgramSerializer,
+    OrganizationSerializer, PersonSerializer, PositionSerializer, PrerequisiteSerializer, ProgramSearchSerializer,
+    ProgramSerializer, ProgramTypeSerializer, SeatSerializer, SubjectSerializer, TypeaheadCourseRunSearchSerializer,
+    TypeaheadProgramSearchSerializer, VideoSerializer
 )
 from course_discovery.apps.catalogs.tests.factories import CatalogFactory
 from course_discovery.apps.core.models import User
@@ -28,9 +28,9 @@ from course_discovery.apps.core.tests.mixins import ElasticsearchTestMixin
 from course_discovery.apps.course_metadata.choices import CourseRunStatus, ProgramStatus
 from course_discovery.apps.course_metadata.models import CourseRun, Program
 from course_discovery.apps.course_metadata.tests.factories import (
-    CourseFactory, CourseRunFactory, SubjectFactory, PrerequisiteFactory, ImageFactory, VideoFactory,
-    OrganizationFactory, PersonFactory, SeatFactory, ProgramFactory, CorporateEndorsementFactory, EndorsementFactory,
-    JobOutlookItemFactory, ExpectedLearningItemFactory, PositionFactory, ProgramTypeFactory
+    CorporateEndorsementFactory, CourseFactory, CourseRunFactory, EndorsementFactory, ExpectedLearningItemFactory,
+    ImageFactory, JobOutlookItemFactory, OrganizationFactory, PersonFactory, PositionFactory, PrerequisiteFactory,
+    ProgramFactory, ProgramTypeFactory, SeatFactory, SubjectFactory, VideoFactory
 )
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
 

course_discovery/apps/api/tests/test_utils.py

 import ddt
-from django.test import TestCase
 import mock
+from django.test import TestCase
 
 from course_discovery.apps.api.utils import cast2int
 
-
 LOGGER_PATH = 'course_discovery.apps.api.utils.logger.exception'
 
 

course_discovery/apps/api/tests/test_views.py

@@ -2,7 +2,7 @@ import ddt
 from django.contrib.auth.models import AnonymousUser
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
-from django.test import TestCase, RequestFactory
+from django.test import RequestFactory, TestCase
 
 from course_discovery.apps.api.views import api_docs_permission_denied_handler
 from course_discovery.apps.core.tests.factories import UserFactory

course_discovery/apps/api/urls.py

@@ -4,7 +4,7 @@ Root API URLs.
 All API URLs should be versioned, so urlpatterns should only
 contain namespaces for the active versions of the API.
 """
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 urlpatterns = [
     url(r'^v1/', include('course_discovery.apps.api.v1.urls', namespace='v1')),

course_discovery/apps/api/utils.py

 import logging
 
-
 logger = logging.getLogger(__name__)
 
 

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

@@ -7,9 +7,9 @@ from django.conf import settings
 from rest_framework.test import APIRequestFactory
 
 from course_discovery.apps.api.serializers import (
-    CatalogSerializer, CourseWithProgramsSerializer, CourseSerializerExcludingClosedRuns,
-    CourseRunWithProgramsSerializer, MinimalProgramSerializer, PersonSerializer, ProgramSerializer,
-    FlattenedCourseRunWithCourseSerializer, OrganizationSerializer, ProgramTypeSerializer
+    CatalogSerializer, CourseRunWithProgramsSerializer, CourseSerializerExcludingClosedRuns,
+    CourseWithProgramsSerializer, FlattenedCourseRunWithCourseSerializer, MinimalProgramSerializer,
+    OrganizationSerializer, PersonSerializer, ProgramSerializer, ProgramTypeSerializer
 )
 
 

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

 # pylint: disable=redefined-builtin,no-member
 import datetime
-from os.path import abspath, join, dirname
 import xml.etree.ElementTree as ET
+from os.path import abspath, dirname, join
 
 import ddt
 import pytz

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

@@ -3,14 +3,14 @@ import datetime
 import urllib
 
 import ddt
-from django.contrib.auth import get_user_model
 import pytz
 import responses
+from django.contrib.auth import get_user_model
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.api.tests.jwt_utils import generate_jwt_header_for_user
-from course_discovery.apps.api.v1.tests.test_views.mixins import SerializationMixin, OAuth2Mixin
+from course_discovery.apps.api.v1.tests.test_views.mixins import OAuth2Mixin, SerializationMixin
 from course_discovery.apps.catalogs.models import Catalog
 from course_discovery.apps.catalogs.tests.factories import CatalogFactory
 from course_discovery.apps.core.tests.factories import UserFactory

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

@@ -7,7 +7,7 @@ import pytz
 from django.conf import settings
 from django.db.models.functions import Lower
 from rest_framework.reverse import reverse
-from rest_framework.test import APITestCase, APIRequestFactory
+from rest_framework.test import APIRequestFactory, APITestCase
 
 from course_discovery.apps.api.v1.tests.test_views.mixins import SerializationMixin
 from course_discovery.apps.core.tests.factories import UserFactory

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

 import datetime
 
 import ddt
-from django.db.models.functions import Lower
 import pytz
+from django.db.models.functions import Lower
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.api.v1.tests.test_views.mixins import SerializationMixin
-from course_discovery.apps.core.tests.factories import UserFactory, USER_PASSWORD
-from course_discovery.apps.course_metadata.choices import ProgramStatus, CourseRunStatus
+from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
+from course_discovery.apps.course_metadata.choices import CourseRunStatus, ProgramStatus
 from course_discovery.apps.course_metadata.models import Course
 from course_discovery.apps.course_metadata.tests.factories import (
     CourseFactory, CourseRunFactory, ProgramFactory, SeatFactory

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

@@ -5,8 +5,8 @@ from django.core.urlresolvers import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.api.v1.tests.test_views.mixins import SerializationMixin
-from course_discovery.apps.core.tests.factories import UserFactory, USER_PASSWORD
-from course_discovery.apps.course_metadata.tests.factories import OrganizationFactory, Organization
+from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
+from course_discovery.apps.course_metadata.tests.factories import Organization, OrganizationFactory
 
 
 @ddt.ddt

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

@@ -10,9 +10,8 @@ from course_discovery.apps.core.tests.helpers import make_image_file
 from course_discovery.apps.course_metadata.choices import ProgramStatus
 from course_discovery.apps.course_metadata.models import Program, ProgramType
 from course_discovery.apps.course_metadata.tests.factories import (
-    CourseFactory, CourseRunFactory, VideoFactory, OrganizationFactory, PersonFactory, ProgramFactory,
-    CorporateEndorsementFactory, EndorsementFactory, JobOutlookItemFactory, ExpectedLearningItemFactory,
-    ProgramTypeFactory
+    CorporateEndorsementFactory, CourseFactory, CourseRunFactory, EndorsementFactory, ExpectedLearningItemFactory,
+    JobOutlookItemFactory, OrganizationFactory, PersonFactory, ProgramFactory, ProgramTypeFactory, VideoFactory
 )
 
 

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

 import datetime
 import json
 import urllib.parse
-from mock import patch
 
 import ddt
+import pytz
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from haystack.query import SearchQuerySet
-import pytz
+from mock import patch
 from rest_framework.test import APITestCase
 
-from course_discovery.apps.api.serializers import (
-    CourseRunSearchSerializer, ProgramSearchSerializer, TypeaheadCourseRunSearchSerializer,
-    TypeaheadProgramSearchSerializer
-)
+from course_discovery.apps.api.serializers import (CourseRunSearchSerializer, ProgramSearchSerializer,
+                                                   TypeaheadCourseRunSearchSerializer, TypeaheadProgramSearchSerializer)
 from course_discovery.apps.api.v1.views.search import TypeaheadSearchView
-from course_discovery.apps.core.tests.factories import UserFactory, USER_PASSWORD, PartnerFactory
+from course_discovery.apps.core.tests.factories import USER_PASSWORD, PartnerFactory, UserFactory
 from course_discovery.apps.core.tests.mixins import ElasticsearchTestMixin
 from course_discovery.apps.course_metadata.choices import CourseRunStatus, ProgramStatus
 from course_discovery.apps.course_metadata.models import CourseRun, Program, ProgramType
-from course_discovery.apps.course_metadata.tests.factories import (
-    CourseFactory, CourseRunFactory, ProgramFactory, OrganizationFactory
-)
+from course_discovery.apps.course_metadata.tests.factories import (CourseFactory, CourseRunFactory, OrganizationFactory,
+                                                                   ProgramFactory)
 
 
 class SerializationMixin:

course_discovery/apps/api/v1/urls.py

@@ -9,7 +9,7 @@ from course_discovery.apps.api.v1.views.course_runs import CourseRunViewSet
 from course_discovery.apps.api.v1.views.courses import CourseViewSet
 from course_discovery.apps.api.v1.views.organizations import OrganizationViewSet
 from course_discovery.apps.api.v1.views.people import PersonViewSet
-from course_discovery.apps.api.v1.views.programs import ProgramViewSet, ProgramTypeListViewSet
+from course_discovery.apps.api.v1.views.programs import ProgramTypeListViewSet, ProgramViewSet
 
 partners_router = routers.SimpleRouter()
 partners_router.register(r'affiliate_window/catalogs', AffiliateWindowViewSet, base_name='affiliate_window')

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

@@ -3,7 +3,7 @@ import datetime
 from django.db import transaction
 from django.http import HttpResponse
 from dry_rest_permissions.generics import DRYPermissions
-from rest_framework import viewsets, status
+from rest_framework import status, viewsets
 from rest_framework.decorators import detail_route
 from rest_framework.response import Response
 

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

 from django.db.models.functions import Lower
-from rest_framework import viewsets, status
+from rest_framework import status, viewsets
 from rest_framework.decorators import list_route
 from rest_framework.filters import DjangoFilterBackend, OrderingFilter
-from rest_framework.permissions import IsAuthenticated, DjangoModelPermissions
+from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated
 from rest_framework.response import Response
 
 from course_discovery.apps.api import filters, serializers
 from course_discovery.apps.api.pagination import ProxiedPagination
-from course_discovery.apps.api.v1.views import get_query_param, PartnerMixin
+from course_discovery.apps.api.v1.views import PartnerMixin, get_query_param
 from course_discovery.apps.core.utils import SearchQuerySetWrapper
 from course_discovery.apps.course_metadata.constants import COURSE_RUN_ID_REGEX
 from course_discovery.apps.course_metadata.models import CourseRun

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

@@ -5,7 +5,7 @@ from rest_framework.permissions import IsAuthenticated
 
 from course_discovery.apps.api import filters, serializers
 from course_discovery.apps.api.pagination import ProxiedPagination
-from course_discovery.apps.api.v1.views import prefetch_related_objects_for_courses, get_query_param
+from course_discovery.apps.api.v1.views import get_query_param, prefetch_related_objects_for_courses
 from course_discovery.apps.course_metadata.constants import COURSE_ID_REGEX
 from course_discovery.apps.course_metadata.models import Course
 

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

 import json
 
-from rest_framework import viewsets, status
+from rest_framework import status, viewsets
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 

course_discovery/apps/catalogs/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django_extensions.db.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/catalogs/migrations/0001_squashed_0002_auto_20160327_2101.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.9.10 on 2016-11-03 22:01
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django_extensions.db.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/core/admin.py

@@ -5,7 +5,7 @@ from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext_lazy as _
 
 from course_discovery.apps.core.forms import UserThrottleRateForm
-from course_discovery.apps.core.models import User, UserThrottleRate, Currency, Partner
+from course_discovery.apps.core.models import Currency, Partner, User, UserThrottleRate
 
 
 @admin.register(User)

course_discovery/apps/core/lookups.py

 from dal import autocomplete
+
 from course_discovery.apps.core.models import User
 
 

course_discovery/apps/core/management/commands/tests/test_create_or_update_partner.py

 from __future__ import unicode_literals
 
-from ddt import ddt, data
-from django.core.management import call_command, CommandError
+from ddt import data, ddt
+from django.core.management import CommandError, call_command
 from django.test import TestCase
 
 from course_discovery.apps.core.models import Partner

course_discovery/apps/core/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django.utils.timezone
-import django.core.validators
 import django.contrib.auth.models
+import django.core.validators
+import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/core/migrations/0001_squashed_0011_auto_20161101_2207.py

@@ -2,14 +2,14 @@
 # Generated by Django 1.9.10 on 2016-11-03 22:04
 from __future__ import unicode_literals
 
-from django.conf import settings
 import django.contrib.auth.models
 import django.core.validators
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
 import django_extensions.db.fields
 import pycountry
+from django.conf import settings
+from django.db import migrations, models
 
 
 def add_currencies(apps, schema_editor):

course_discovery/apps/core/migrations/0002_userthrottlerate.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/core/migrations/0008_partner.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django_extensions.db.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/core/tests/factories.py

 import factory
 from factory.fuzzy import FuzzyText
 
-from course_discovery.apps.core.models import User, Partner
+from course_discovery.apps.core.models import Partner, User
 from course_discovery.apps.core.tests.utils import FuzzyUrlRoot
 
 USER_PASSWORD = 'password'

course_discovery/apps/core/tests/helpers.py

@@ -2,9 +2,9 @@
 Helper methods for testing the processing of image files.
 """
 from io import BytesIO
-from PIL import Image
 
 from django.core.files.uploadedfile import SimpleUploadedFile
+from PIL import Image
 
 
 def make_image_stream(width, height):

course_discovery/apps/core/tests/test_context_processors.py

 """ Context processor tests. """
 
-from django.test import TestCase, override_settings, RequestFactory
+from django.test import RequestFactory, TestCase, override_settings
 
 from course_discovery.apps.core.context_processors import core
 

course_discovery/apps/core/tests/test_lookups.py

@@ -3,7 +3,7 @@ import json
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
-from course_discovery.apps.core.tests.factories import UserFactory, USER_PASSWORD
+from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 
 
 class UserAutocompleteTests(TestCase):

course_discovery/apps/core/tests/test_models.py

@@ -4,7 +4,7 @@ from django.test import TestCase
 from social.apps.django_app.default.models import UserSocialAuth
 
 from course_discovery.apps.core.models import Currency
-from course_discovery.apps.core.tests.factories import UserFactory, PartnerFactory
+from course_discovery.apps.core.tests.factories import PartnerFactory, UserFactory
 
 
 class UserTests(TestCase):

course_discovery/apps/core/tests/test_throttles.py

@@ -3,7 +3,7 @@ from django.core.urlresolvers import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.core.models import UserThrottleRate
-from course_discovery.apps.core.tests.factories import UserFactory, USER_PASSWORD
+from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 from course_discovery.apps.core.throttles import OverridableUserRateThrottle
 
 

course_discovery/apps/core/tests/test_utils.py

@@ -2,7 +2,7 @@ from django.db import models
 from django.test import TestCase
 from haystack.query import SearchQuerySet
 
-from course_discovery.apps.core.utils import get_all_related_field_names, SearchQuerySetWrapper
+from course_discovery.apps.core.utils import SearchQuerySetWrapper, get_all_related_field_names
 from course_discovery.apps.course_metadata.models import CourseRun
 from course_discovery.apps.course_metadata.tests.factories import CourseRunFactory
 

course_discovery/apps/core/tests/test_views.py

 """Test core.views."""
 
-from django.db import DatabaseError
+import mock
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
+from django.db import DatabaseError
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.encoding import force_text
-import mock
 
 from course_discovery.apps.core.constants import Status
 
-
 User = get_user_model()
 
 

course_discovery/apps/core/tests/utils.py

 import json
 import math
-
 from urllib.parse import parse_qs, urlparse
-from factory.fuzzy import (
-    BaseFuzzyAttribute, FuzzyText, FuzzyChoice
-)
+
+from factory.fuzzy import BaseFuzzyAttribute, FuzzyChoice, FuzzyText
 
 from course_discovery.apps.core.tests.helpers import make_image_stream
 

course_discovery/apps/core/views.py

@@ -3,10 +3,9 @@ import logging
 import uuid
 
 from django.conf import settings
-from django.contrib.auth import get_user_model, login, authenticate
-from django.db import transaction, connection, DatabaseError
-from django.http import Http404
-from django.http import JsonResponse
+from django.contrib.auth import authenticate, get_user_model, login
+from django.db import DatabaseError, connection, transaction
+from django.http import Http404, JsonResponse
 from django.shortcuts import redirect
 from django.views.generic import View
 

course_discovery/apps/course_metadata/admin.py

@@ -4,7 +4,7 @@ from django.http import HttpResponseRedirect
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
-from course_discovery.apps.course_metadata.forms import ProgramAdminForm, CourseAdminForm
+from course_discovery.apps.course_metadata.forms import CourseAdminForm, ProgramAdminForm
 from course_discovery.apps.course_metadata.models import *  # pylint: disable=wildcard-import
 from course_discovery.apps.course_metadata.publishers import ProgramPublisherException
 from course_discovery.apps.course_metadata.utils import MarketingSiteAPIClientException

course_discovery/apps/course_metadata/choices.py

 from django.utils.translation import ugettext_lazy as _
-from djchoices import DjangoChoices, ChoiceItem
+from djchoices import ChoiceItem, DjangoChoices
 
 
 class CourseRunStatus(DjangoChoices):

course_discovery/apps/course_metadata/data_loaders/api.py

 import concurrent.futures
-from decimal import Decimal
-from io import BytesIO
 import logging
 import math
+from decimal import Decimal
+from io import BytesIO
 
+import requests
 from django.core.files import File
 from opaque_keys.edx.keys import CourseKey
-import requests
 
 from course_discovery.apps.core.models import Currency
-from course_discovery.apps.course_metadata.choices import CourseRunStatus, CourseRunPacing
+from course_discovery.apps.course_metadata.choices import CourseRunPacing, CourseRunStatus
 from course_discovery.apps.course_metadata.data_loaders import AbstractDataLoader
 from course_discovery.apps.course_metadata.models import (
-    Video, Organization, Seat, CourseRun, Program, Course, ProgramType,
+    Course, CourseRun, Organization, Program, ProgramType, Seat, Video
 )
 
 logger = logging.getLogger(__name__)

course_discovery/apps/course_metadata/data_loaders/marketing_site.py

@@ -5,17 +5,17 @@ import logging
 from urllib.parse import parse_qs, urlencode, urlparse
 from uuid import UUID
 
-from dateutil import rrule
 import pytz
+from dateutil import rrule
 from django.db.models import Q
 from django.utils.functional import cached_property
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 
-from course_discovery.apps.course_metadata.choices import CourseRunStatus, CourseRunPacing
+from course_discovery.apps.course_metadata.choices import CourseRunPacing, CourseRunStatus
 from course_discovery.apps.course_metadata.data_loaders import AbstractDataLoader
 from course_discovery.apps.course_metadata.models import (
-    Course, Organization, Person, Subject, Program, Position, LevelType, CourseRun
+    Course, CourseRun, LevelType, Organization, Person, Position, Program, Subject
 )
 from course_discovery.apps.course_metadata.utils import MarketingSiteAPIClient
 from course_discovery.apps.ietf_language_tags.models import LanguageTag

course_discovery/apps/course_metadata/data_loaders/tests/test_api.py

@@ -8,17 +8,15 @@ from django.test import TestCase
 from pytz import UTC
 
 from course_discovery.apps.core.tests.utils import mock_api_callback, mock_jpeg_callback
-from course_discovery.apps.course_metadata.choices import CourseRunStatus, CourseRunPacing
+from course_discovery.apps.course_metadata.choices import CourseRunPacing, CourseRunStatus
 from course_discovery.apps.course_metadata.data_loaders.api import (
-    OrganizationsApiDataLoader, CoursesApiDataLoader, EcommerceApiDataLoader, AbstractDataLoader, ProgramsApiDataLoader
+    AbstractDataLoader, CoursesApiDataLoader, EcommerceApiDataLoader, OrganizationsApiDataLoader, ProgramsApiDataLoader
 )
-from course_discovery.apps.course_metadata.data_loaders.tests import JSON, JPEG, mock_data
+from course_discovery.apps.course_metadata.data_loaders.tests import JPEG, JSON, mock_data
 from course_discovery.apps.course_metadata.data_loaders.tests.mixins import ApiClientTestMixin, DataLoaderTestMixin
-from course_discovery.apps.course_metadata.models import (
-    Course, CourseRun, Organization, Seat, Program, ProgramType,
-)
+from course_discovery.apps.course_metadata.models import Course, CourseRun, Organization, Program, ProgramType, Seat
 from course_discovery.apps.course_metadata.tests.factories import (
-    CourseRunFactory, SeatFactory, ImageFactory, VideoFactory, OrganizationFactory, CourseFactory,
+    CourseFactory, CourseRunFactory, ImageFactory, OrganizationFactory, SeatFactory, VideoFactory
 )
 
 LOGGER_PATH = 'course_discovery.apps.course_metadata.data_loaders.api.logger'

course_discovery/apps/course_metadata/data_loaders/tests/test_marketing_site.py

@@ -4,23 +4,23 @@ import math
 from urllib.parse import parse_qs, urlparse
 from uuid import UUID
 
-from dateutil import rrule
 import ddt
-from django.test import TestCase
 import mock
-from opaque_keys.edx.keys import CourseKey
 import pytz
 import responses
+from dateutil import rrule
+from django.test import TestCase
+from opaque_keys.edx.keys import CourseKey
 from testfixtures import LogCapture
 
-from course_discovery.apps.course_metadata.choices import CourseRunStatus, CourseRunPacing
+from course_discovery.apps.course_metadata.choices import CourseRunPacing, CourseRunStatus
 from course_discovery.apps.course_metadata.data_loaders.marketing_site import (
-    XSeriesMarketingSiteDataLoader, SubjectMarketingSiteDataLoader, SchoolMarketingSiteDataLoader,
-    SponsorMarketingSiteDataLoader, PersonMarketingSiteDataLoader, CourseMarketingSiteDataLoader
+    CourseMarketingSiteDataLoader, PersonMarketingSiteDataLoader, SchoolMarketingSiteDataLoader,
+    SponsorMarketingSiteDataLoader, SubjectMarketingSiteDataLoader, XSeriesMarketingSiteDataLoader
 )
 from course_discovery.apps.course_metadata.data_loaders.tests import JSON, mock_data
 from course_discovery.apps.course_metadata.data_loaders.tests.mixins import DataLoaderTestMixin
-from course_discovery.apps.course_metadata.models import Organization, Subject, Program, Video, Person, Course
+from course_discovery.apps.course_metadata.models import Course, Organization, Person, Program, Subject, Video
 from course_discovery.apps.course_metadata.tests import factories
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
 

course_discovery/apps/course_metadata/forms.py

@@ -5,7 +5,7 @@ from django.forms.utils import ErrorList
 from django.utils.translation import ugettext_lazy as _
 
 from course_discovery.apps.course_metadata.choices import ProgramStatus
-from course_discovery.apps.course_metadata.models import Program, CourseRun, Course
+from course_discovery.apps.course_metadata.models import Course, CourseRun, Program
 
 
 def filter_choices_to_render_with_order_preserved(self, selected_choices):

course_discovery/apps/course_metadata/lookups.py

+from dal import autocomplete
 from django.db.models import Q
 from django.template.loader import render_to_string
 
-from dal import autocomplete
-from .models import Course, CourseRun, Organization, Video, Person
+from .models import Course, CourseRun, Organization, Person, Video
 
 
 class CourseAutocomplete(autocomplete.Select2QuerySetView):

course_discovery/apps/course_metadata/management/commands/create_test_program.py

@@ -5,8 +5,8 @@ from django.core.management import BaseCommand
 from course_discovery.apps.core.models import Partner
 from course_discovery.apps.course_metadata.models import Program
 from course_discovery.apps.course_metadata.tests.factories import (
-    OrganizationFactory, CorporateEndorsementFactory, EndorsementFactory, ExpectedLearningItemFactory,
-    FAQFactory, JobOutlookItemFactory, ProgramFactory, CourseFactory, CourseRunFactory
+    CorporateEndorsementFactory, CourseFactory, CourseRunFactory, EndorsementFactory, ExpectedLearningItemFactory,
+    FAQFactory, JobOutlookItemFactory, OrganizationFactory, ProgramFactory
 )
 
 logger = logging.getLogger(__name__)

course_discovery/apps/course_metadata/management/commands/refresh_course_metadata.py

@@ -2,23 +2,22 @@ import concurrent.futures
 import itertools
 import logging
 
+import jwt
+import waffle
 from django.core.management import BaseCommand, CommandError
 from django.db import connection
 from edx_rest_api_client.client import EdxRestApiClient
-import jwt
-import waffle
 
 from course_discovery.apps.core.models import Partner
 from course_discovery.apps.course_metadata.data_loaders.api import (
-    OrganizationsApiDataLoader, EcommerceApiDataLoader, ProgramsApiDataLoader, CoursesApiDataLoader,
+    CoursesApiDataLoader, EcommerceApiDataLoader, OrganizationsApiDataLoader, ProgramsApiDataLoader
 )
 from course_discovery.apps.course_metadata.data_loaders.marketing_site import (
-    XSeriesMarketingSiteDataLoader, SubjectMarketingSiteDataLoader, SchoolMarketingSiteDataLoader,
-    SponsorMarketingSiteDataLoader, PersonMarketingSiteDataLoader, CourseMarketingSiteDataLoader,
+    CourseMarketingSiteDataLoader, PersonMarketingSiteDataLoader, SchoolMarketingSiteDataLoader,
+    SponsorMarketingSiteDataLoader, SubjectMarketingSiteDataLoader, XSeriesMarketingSiteDataLoader
 )
 from course_discovery.apps.course_metadata.models import Course
 
-
 logger = logging.getLogger(__name__)
 
 

course_discovery/apps/course_metadata/management/commands/tests/test_refresh_course_metadata.py

@@ -4,17 +4,17 @@ import ddt
 import jwt
 import mock
 import responses
-from django.core.management import call_command, CommandError
+from django.core.management import CommandError, call_command
 from django.test import TransactionTestCase
 
 from course_discovery.apps.core.tests.factories import PartnerFactory
 from course_discovery.apps.core.tests.utils import mock_api_callback
 from course_discovery.apps.course_metadata.data_loaders.api import (
-    OrganizationsApiDataLoader, CoursesApiDataLoader, EcommerceApiDataLoader, ProgramsApiDataLoader,
+    CoursesApiDataLoader, EcommerceApiDataLoader, OrganizationsApiDataLoader, ProgramsApiDataLoader
 )
 from course_discovery.apps.course_metadata.data_loaders.marketing_site import (
-    XSeriesMarketingSiteDataLoader, SubjectMarketingSiteDataLoader, SchoolMarketingSiteDataLoader,
-    SponsorMarketingSiteDataLoader, PersonMarketingSiteDataLoader, CourseMarketingSiteDataLoader
+    CourseMarketingSiteDataLoader, PersonMarketingSiteDataLoader, SchoolMarketingSiteDataLoader,
+    SponsorMarketingSiteDataLoader, SubjectMarketingSiteDataLoader, XSeriesMarketingSiteDataLoader
 )
 from course_discovery.apps.course_metadata.data_loaders.tests import mock_data
 from course_discovery.apps.course_metadata.management.commands.refresh_course_metadata import execute_parallel_loader

course_discovery/apps/course_metadata/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django_extensions.db.fields
 import django.db.models.deletion
+import django_extensions.db.fields
 import sortedm2m.fields
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0001_squashed_0033_courserun_mobile_available.py

@@ -2,10 +2,8 @@
 # Generated by Django 1.9.10 on 2016-10-25 17:11
 from __future__ import unicode_literals
 
-import course_discovery.apps.course_metadata.utils
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.db import migrations, models
+import uuid
+
 import django.db.migrations.operations.special
 import django.db.models.deletion
 import django_extensions.db.fields
@@ -14,7 +12,10 @@ import sortedm2m.fields
 import sortedm2m.operations
 import stdimage.models
 import taggit.managers
-import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+import course_discovery.apps.course_metadata.utils
 
 SEAT_TYPES = ('Audit', 'Credit', 'Professional', 'Verified',)
 

course_discovery/apps/course_metadata/migrations/0004_program.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django_extensions.db.fields
 import uuid
 
+import django_extensions.db.fields
+from django.db import migrations, models
+
 
 class Migration(migrations.Migration):
 

course_discovery/apps/course_metadata/migrations/0005_auto_20160713_0113.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import uuid
 
+from django.db import migrations, models
+
 
 class Migration(migrations.Migration):
 

course_discovery/apps/course_metadata/migrations/0007_auto_20160720_1749.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import sortedm2m.fields
 import django_extensions.db.fields
+import sortedm2m.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0009_auto_20160725_1751.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0011_auto_20160805_1949.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 import django_extensions.db.fields
-import sortedm2m.fields
 import djchoices.choices
+import sortedm2m.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0017_auto_20160815_2135.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import taggit.managers
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0018_auto_20160815_2252.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django_extensions.db.fields
 import uuid
+
 import django.db.models.deletion
+import django_extensions.db.fields
+from django.db import migrations, models
 
 
 def delete_people(apps, schema_editor):

course_discovery/apps/course_metadata/migrations/0019_program_banner_image.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import stdimage.models
 import stdimage.utils
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0020_auto_20160819_1942.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import stdimage.models
+from django.db import migrations, models
+
 import course_discovery.apps.course_metadata.utils
 
 

course_discovery/apps/course_metadata/migrations/0024_auto_20160901_1426.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import djchoices.choices
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0029_auto_20160923_1306.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 from sortedm2m import fields, operations
 
 
-
 class Migration(migrations.Migration):
 
     dependencies = [

course_discovery/apps/course_metadata/migrations/0039_programtype_logo_image.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.9.11 on 2016-12-13 10:57
 from __future__ import unicode_literals
 
-from django.db import migrations
 import stdimage.models
 import stdimage.utils
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0040_auto_20161220_1644.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.9.11 on 2016-12-20 16:44
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django_extensions.db.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0044_auto_20170131_1749.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.9.11 on 2017-01-31 17:49
 from __future__ import unicode_literals
 
-from django.db import migrations
 import taggit_autosuggest.managers
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0045_person_profile_image.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.9.11 on 2017-01-23 19:51
 from __future__ import unicode_literals
 
-from django.db import migrations
 import stdimage.models
 import stdimage.utils
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/migrations/0047_personwork.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.9.11 on 2017-01-31 19:21
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 import django_extensions.db.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/course_metadata/models.py

@@ -21,13 +21,10 @@ from stdimage.utils import UploadToAutoSlug
 from taggit_autosuggest.managers import TaggableManager
 
 from course_discovery.apps.core.models import Currency, Partner
-from course_discovery.apps.course_metadata.choices import (
-    CourseRunStatus, CourseRunPacing, ProgramStatus, ReportingType
-)
+from course_discovery.apps.course_metadata.choices import CourseRunPacing, CourseRunStatus, ProgramStatus, ReportingType
 from course_discovery.apps.course_metadata.publishers import MarketingSitePublisher
 from course_discovery.apps.course_metadata.query import CourseQuerySet, CourseRunQuerySet, ProgramQuerySet
-from course_discovery.apps.course_metadata.utils import UploadToFieldNamePath
-from course_discovery.apps.course_metadata.utils import clean_query, custom_render_variations
+from course_discovery.apps.course_metadata.utils import UploadToFieldNamePath, clean_query, custom_render_variations
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
 
 logger = logging.getLogger(__name__)

course_discovery/apps/course_metadata/query.py

@@ -4,8 +4,7 @@ import pytz
 from django.db import models
 from django.db.models.query_utils import Q
 
-from course_discovery.apps.course_metadata.choices import CourseRunStatus
-from course_discovery.apps.course_metadata.choices import ProgramStatus
+from course_discovery.apps.course_metadata.choices import CourseRunStatus, ProgramStatus
 
 
 class CourseQuerySet(models.QuerySet):

course_discovery/apps/course_metadata/signals.py

+import waffle
 from django.db.models.signals import pre_delete
 from django.dispatch import receiver
-import waffle
 
 from course_discovery.apps.course_metadata.models import Program
 from course_discovery.apps.course_metadata.publishers import MarketingSitePublisher

course_discovery/apps/course_metadata/tests/factories.py

 from datetime import datetime
 
 import factory
-from factory.fuzzy import FuzzyText, FuzzyChoice, FuzzyDateTime, FuzzyInteger, FuzzyDecimal
+from factory.fuzzy import FuzzyChoice, FuzzyDateTime, FuzzyDecimal, FuzzyInteger, FuzzyText
 from pytz import UTC
 
 from course_discovery.apps.core.tests.factories import PartnerFactory
 from course_discovery.apps.core.tests.utils import FuzzyURL
-from course_discovery.apps.course_metadata.choices import (
-    CourseRunStatus, CourseRunPacing, ProgramStatus, ReportingType
-)
 from course_discovery.apps.course_metadata.models import *  # pylint: disable=wildcard-import
 from course_discovery.apps.ietf_language_tags.models import LanguageTag
 

course_discovery/apps/course_metadata/tests/mixins.py

 import json
 import urllib
 
-from django.test import TestCase
-from factory.fuzzy import FuzzyText, FuzzyInteger
 import responses
+from django.test import TestCase
+from factory.fuzzy import FuzzyInteger, FuzzyText
 
 from course_discovery.apps.core.tests.utils import FuzzyUrlRoot
 

course_discovery/apps/course_metadata/tests/test_admin.py

@@ -3,7 +3,7 @@ import itertools
 import ddt
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
-from django.test import TestCase, LiveServerTestCase
+from django.test import LiveServerTestCase, TestCase
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
@@ -11,7 +11,7 @@ from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
 
 from course_discovery.apps.core.models import Partner
-from course_discovery.apps.core.tests.factories import UserFactory, USER_PASSWORD
+from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 from course_discovery.apps.core.tests.helpers import make_image_file
 from course_discovery.apps.course_metadata.choices import ProgramStatus
 from course_discovery.apps.course_metadata.forms import ProgramAdminForm

course_discovery/apps/course_metadata/tests/test_lookups.py

@@ -4,12 +4,11 @@ import ddt
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
+from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 from course_discovery.apps.course_metadata.tests import factories
-from course_discovery.apps.core.tests.factories import UserFactory, USER_PASSWORD
-
+from course_discovery.apps.course_metadata.tests.factories import PositionFactory
 
 # pylint: disable=no-member
-from course_discovery.apps.course_metadata.tests.factories import PositionFactory
 
 
 @ddt.ddt

course_discovery/apps/course_metadata/tests/test_models.py

@@ -3,6 +3,7 @@ from decimal import Decimal
 
 import ddt
 import mock
+import responses
 from dateutil.parser import parse
 from django.conf import settings
 from django.db import IntegrityError
@@ -10,7 +11,6 @@ from django.db.models.functions import Lower
 from django.test import TestCase
 from factory.fuzzy import FuzzyText
 from freezegun import freeze_time
-import responses
 
 from course_discovery.apps.core.models import Currency
 from course_discovery.apps.core.tests.helpers import make_image_file
@@ -18,8 +18,8 @@ from course_discovery.apps.core.tests.mixins import ElasticsearchTestMixin
 from course_discovery.apps.core.utils import SearchQuerySetWrapper
 from course_discovery.apps.course_metadata.choices import ProgramStatus
 from course_discovery.apps.course_metadata.models import (
-    AbstractMediaModel, AbstractNamedModel, AbstractValueModel,
-    CorporateEndorsement, Course, CourseRun, Endorsement, FAQ, Seat, SeatType, ProgramType,
+    FAQ, AbstractMediaModel, AbstractNamedModel, AbstractValueModel, CorporateEndorsement, Course, CourseRun,
+    Endorsement, ProgramType, Seat, SeatType
 )
 from course_discovery.apps.course_metadata.publishers import MarketingSitePublisher
 from course_discovery.apps.course_metadata.tests import factories, toggle_switch

course_discovery/apps/course_metadata/tests/test_publishers.py

@@ -2,16 +2,13 @@ import mock
 import responses
 
 from course_discovery.apps.course_metadata.choices import ProgramStatus
+from course_discovery.apps.course_metadata.models import ProgramType
 from course_discovery.apps.course_metadata.publishers import (
-    MarketingSiteAPIClient,
-    MarketingSitePublisher,
-    ProgramPublisherException,
+    MarketingSiteAPIClient, MarketingSitePublisher, ProgramPublisherException
 )
 from course_discovery.apps.course_metadata.tests.factories import ProgramFactory
 from course_discovery.apps.course_metadata.tests.mixins import MarketingSitePublisherTestMixin
 
-from course_discovery.apps.course_metadata.models import ProgramType
-
 
 class MarketingSitePublisherTests(MarketingSitePublisherTestMixin):
     """

course_discovery/apps/course_metadata/tests/test_query.py

@@ -4,8 +4,7 @@ import ddt
 import pytz
 from django.test import TestCase
 
-from course_discovery.apps.course_metadata.choices import CourseRunStatus
-from course_discovery.apps.course_metadata.choices import ProgramStatus
+from course_discovery.apps.course_metadata.choices import CourseRunStatus, ProgramStatus
 from course_discovery.apps.course_metadata.models import Course, CourseRun, Program
 from course_discovery.apps.course_metadata.tests.factories import CourseRunFactory, ProgramFactory, SeatFactory
 

course_discovery/apps/course_metadata/tests/test_signals.py

@@ -6,7 +6,6 @@ from django.test import TestCase
 from course_discovery.apps.course_metadata.models import ProgramType
 from course_discovery.apps.course_metadata.tests import factories, toggle_switch
 
-
 MARKETING_SITE_PUBLISHERS_MODULE = 'course_discovery.apps.course_metadata.publishers.MarketingSitePublisher'
 
 

course_discovery/apps/course_metadata/tests/test_utils.py

 import os
 
 import ddt
-from django.test import TestCase
 import responses
+from django.test import TestCase
 
+from course_discovery.apps.course_metadata import utils
 from course_discovery.apps.course_metadata.exceptions import MarketingSiteAPIClientException
 from course_discovery.apps.course_metadata.tests.factories import ProgramFactory
 from course_discovery.apps.course_metadata.tests.mixins import MarketingSiteAPIClientTestMixin
-from course_discovery.apps.course_metadata import utils
 
 
 @ddt.ddt

course_discovery/apps/course_metadata/urls.py

@@ -3,10 +3,10 @@ URLs for the admin autocomplete lookups.
 """
 from django.conf.urls import url
 
-from course_discovery.apps.course_metadata.views import CourseRunSelectionAdmin
 from course_discovery.apps.course_metadata.lookups import (
-    CourseAutocomplete, CourseRunAutocomplete, OrganizationAutocomplete, VideoAutocomplete,
-    PersonAutocomplete)
+    CourseAutocomplete, CourseRunAutocomplete, OrganizationAutocomplete, PersonAutocomplete, VideoAutocomplete
+)
+from course_discovery.apps.course_metadata.views import CourseRunSelectionAdmin
 
 urlpatterns = [
     url(r'^update_course_runs/(?P<pk>\d+)/$', CourseRunSelectionAdmin.as_view(), name='update_course_runs',),

course_discovery/apps/course_metadata/utils.py

-from django.utils.functional import cached_property
 import requests
+from django.utils.functional import cached_property
 from stdimage.models import StdImageFieldFile
 from stdimage.utils import UploadTo
 

course_discovery/apps/course_metadata/views.py

 from django.contrib import messages
 from django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect, Http404
+from django.http import Http404, HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView, UpdateView
 

course_discovery/apps/edx_catalog_extensions/migrations/0001_squashed_0003_create_publish_to_marketing_site_flag.py

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 
 from django.db import migrations
 
-
 PAID_SEAT_TYPES = ('credit', 'professional', 'verified',)
 PROGRAM_TYPES = ('XSeries', 'MicroMasters',)
 

course_discovery/apps/edx_haystack_extensions/admin.py

 from django.contrib import admin
 from solo.admin import SingletonModelAdmin
-from course_discovery.apps.edx_haystack_extensions.models import ElasticsearchBoostConfig
 
+from course_discovery.apps.edx_haystack_extensions.models import ElasticsearchBoostConfig
 
 admin.site.register(ElasticsearchBoostConfig, SingletonModelAdmin)

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

@@ -7,7 +7,6 @@ from haystack.management.commands.update_index import Command as HaystackCommand
 
 from course_discovery.settings.process_synonyms import get_synonyms
 
-
 logger = logging.getLogger(__name__)
 
 

course_discovery/apps/edx_haystack_extensions/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import jsonfield.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/edx_haystack_extensions/migrations/0001_squashed_0002_auto_20160826_1750.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.9.10 on 2016-11-03 22:19
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import jsonfield.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

course_discovery/apps/edx_haystack_extensions/migrations/0002_auto_20160826_1750.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import jsonfield.fields
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

course_discovery/apps/edx_haystack_extensions/migrations/0002_auto_20170118_1826.py

@@ -2,6 +2,7 @@
 # Generated by Django 1.9.11 on 2017-01-18 18:26
 from django.db import migrations
 
+
 def create_or_update_config_record(apps, schema_editor):
     """Create or update the ElasticsearchBoostConfig record."""
 

course_discovery/apps/edx_haystack_extensions/migrations/0003_auto_20170124_1834.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations
 
+
 def add_professional_certificate_boosting(apps, schema_editor):
     """ Update ElasticsearchBoostConfig to include professional certificate boosting."""
 

course_discovery/apps/edx_haystack_extensions/migrations/0004_auto_20170126_1510.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations
 
+
 def add_enrollable_paid_seat_boosting(apps, schema_editor):
     """Add enrollable paid Seat boosting function to ElasticsearchBoostConfig instance."""
 

course_discovery/apps/edx_haystack_extensions/tests/test_backends.py

@@ -2,7 +2,7 @@ from django.test import TestCase
 
 from course_discovery.apps.edx_haystack_extensions.backends import EdxElasticsearchSearchBackend
 from course_discovery.apps.edx_haystack_extensions.tests.mixins import (
-    SimpleQuerySearchBackendMixinTestMixin, NonClearingSearchBackendMixinTestMixin
+    NonClearingSearchBackendMixinTestMixin, SimpleQuerySearchBackendMixinTestMixin
 )
 
 

course_discovery/apps/ietf_language_tags/lookups.py

+from dal import autocomplete
 from django.db.models import Q
 
-from dal import autocomplete
 from course_discovery.apps.ietf_language_tags.models import LanguageTag