isort updates

openedx/core/djangoapps/course_groups/tests/helpers.py

@@ -2,18 +2,18 @@
 Helper methods for testing cohorts.
 """
 
-from factory import post_generation, Sequence
-from factory.django import DjangoModelFactory
 import json
 
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
-from xmodule.modulestore.django import modulestore
-from xmodule.modulestore import ModuleStoreEnum
-
-from ..cohorts import set_course_cohorted
 from django_comment_common.models import CourseDiscussionSettings
 from django_comment_common.utils import set_course_discussion_settings
-from ..models import CourseUserGroup, CourseCohort, CourseCohortsSettings, CohortMembership
+from factory import Sequence, post_generation
+from factory.django import DjangoModelFactory
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from xmodule.modulestore import ModuleStoreEnum
+from xmodule.modulestore.django import modulestore
+
+from ..cohorts import set_course_cohorted
+from ..models import CohortMembership, CourseCohort, CourseCohortsSettings, CourseUserGroup
 
 
 class CohortFactory(DjangoModelFactory):

openedx/core/djangoapps/course_groups/tests/test_cohorts.py

@@ -5,13 +5,12 @@ Tests for cohorts
 import ddt
 from mock import call, patch
 from nose.plugins.attrib import attr
-import before_after
 
+import before_after
 from django.contrib.auth.models import User
 from django.db import IntegrityError
 from django.http import Http404
 from django.test import TestCase
-
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from student.models import CourseEnrollment
 from student.tests.factories import UserFactory
@@ -19,12 +18,9 @@ from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import TEST_DATA_MIXED_MODULESTORE, ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import ToyCourseFactory
 
-from ..models import CourseUserGroup, CourseCohort, CourseUserGroupPartitionGroup
 from .. import cohorts
-from ..tests.helpers import (
-    config_course_cohorts, config_course_cohorts_legacy,
-    CohortFactory, CourseCohortFactory
-)
+from ..models import CourseCohort, CourseUserGroup, CourseUserGroupPartitionGroup
+from ..tests.helpers import CohortFactory, CourseCohortFactory, config_course_cohorts, config_course_cohorts_legacy
 
 
 @attr(shard=2)

openedx/core/djangoapps/course_groups/tests/test_views.py

@@ -4,37 +4,32 @@ Tests for course group views
 # pylint: disable=attribute-defined-outside-init
 # pylint: disable=no-member
 import json
-
 from collections import namedtuple
+
 from nose.plugins.attrib import attr
 
 from django.contrib.auth.models import User
 from django.http import Http404
 from django.test.client import RequestFactory
-
 from django_comment_common.models import CourseDiscussionSettings
 from django_comment_common.utils import get_course_discussion_settings
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from student.models import CourseEnrollment
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
-
-from ..models import CourseUserGroup, CourseCohort
+from ..cohorts import DEFAULT_COHORT_NAME, get_cohort, get_cohort_by_id, get_cohort_by_name, get_group_info_for_cohort
+from ..models import CourseCohort, CourseUserGroup
 from ..views import (
+    add_users_to_cohort,
+    cohort_handler,
     course_cohort_settings_handler,
-    cohort_handler, users_in_cohort,
-    add_users_to_cohort, remove_user_from_cohort,
     link_cohort_to_partition_group,
+    remove_user_from_cohort,
+    users_in_cohort
 )
-from ..cohorts import (
-    get_cohort, get_cohort_by_name, get_cohort_by_id,
-    DEFAULT_COHORT_NAME, get_group_info_for_cohort
-)
-from .helpers import (
-    config_course_cohorts, config_course_cohorts_legacy, CohortFactory, CourseCohortFactory
-)
+from .helpers import CohortFactory, CourseCohortFactory, config_course_cohorts, config_course_cohorts_legacy
 
 
 @attr(shard=2)

openedx/core/djangoapps/verified_track_content/partition_scheme.py

@@ -1,20 +1,18 @@
 """
 UserPartitionScheme for enrollment tracks.
 """
-from django.conf import settings
-
+from course_modes.models import CourseMode
 from courseware.masquerade import (
     get_course_masquerade,
     get_masquerading_user_group,
     is_masquerading_as_specific_student
 )
-from course_modes.models import CourseMode
-from student.models import CourseEnrollment
+from django.conf import settings
 from opaque_keys.edx.keys import CourseKey
 from openedx.core.djangoapps.verified_track_content.models import VerifiedTrackCohortedCourse
+from student.models import CourseEnrollment
 from xmodule.partitions.partitions import Group, UserPartition
 
-
 # These IDs must be less than 100 so that they do not overlap with Groups in
 # CohortUserPartition or RandomUserPartitionScheme
 # (CMS' course_group_config uses a minimum value of 100 for all generated IDs).

openedx/core/djangoapps/verified_track_content/tests/test_models.py

@@ -4,23 +4,26 @@ Tests for Verified Track Cohorting models
 # pylint: disable=attribute-defined-outside-init
 # pylint: disable=no-member
 
-from django.test import TestCase
 import mock
 from mock import patch
 
+from django.test import TestCase
 from opaque_keys.edx.keys import CourseKey
-
-from openedx.core.djangoapps.course_groups.cohorts import get_cohort
-from student.models import CourseMode
-from student.tests.factories import UserFactory, CourseEnrollmentFactory
-from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory
-from ..models import VerifiedTrackCohortedCourse, DEFAULT_VERIFIED_COHORT_NAME
-from ..tasks import sync_cohort_with_mode
 from openedx.core.djangoapps.course_groups.cohorts import (
-    set_course_cohorted, add_cohort, CourseCohort, DEFAULT_COHORT_NAME
+    DEFAULT_COHORT_NAME,
+    CourseCohort,
+    add_cohort,
+    get_cohort,
+    set_course_cohorted
 )
 from openedx.core.djangolib.testing.utils import skip_unless_lms
+from student.models import CourseMode
+from student.tests.factories import CourseEnrollmentFactory, UserFactory
+from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+from ..models import DEFAULT_VERIFIED_COHORT_NAME, VerifiedTrackCohortedCourse
+from ..tasks import sync_cohort_with_mode
 
 
 class TestVerifiedTrackCohortedCourse(TestCase):