Reorder LMS imports using isort

lms/djangoapps/instructor_task/tests/factories.py

@@ -1,12 +1,13 @@
 import json
 
 import factory
-from factory.django import DjangoModelFactory
-from student.tests.factories import UserFactory as StudentUserFactory
-from lms.djangoapps.instructor_task.models import InstructorTask
 from celery.states import PENDING
+from factory.django import DjangoModelFactory
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
+from lms.djangoapps.instructor_task.models import InstructorTask
+from student.tests.factories import UserFactory as StudentUserFactory
+
 
 class InstructorTaskFactory(DjangoModelFactory):
     class Meta(object):

lms/djangoapps/instructor_task/tests/test_api.py

@@ -2,47 +2,46 @@
 Test for LMS instructor background task queue management
 """
 import ddt
-from mock import patch, Mock, MagicMock
+from mock import MagicMock, Mock, patch
 from nose.plugins.attrib import attr
-from bulk_email.models import CourseEmail, SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_LEARNERS
-from courseware.tests.factories import UserFactory
-from xmodule.modulestore.exceptions import ItemNotFoundError
 
+from bulk_email.models import SEND_TO_LEARNERS, SEND_TO_MYSELF, SEND_TO_STAFF, CourseEmail
+from certificates.models import CertificateGenerationHistory, CertificateStatuses
+from courseware.tests.factories import UserFactory
 from lms.djangoapps.instructor_task.api import (
-    get_running_instructor_tasks,
+    SpecificStudentIdMissingError,
+    generate_certificates_for_students,
     get_instructor_task_history,
-    submit_rescore_problem_for_all_students,
-    submit_rescore_problem_for_student,
-    submit_rescore_entrance_exam_for_student,
-    submit_reset_problem_attempts_for_all_students,
-    submit_reset_problem_attempts_in_entrance_exam,
-    submit_delete_problem_state_for_all_students,
-    submit_delete_entrance_exam_state_for_student,
+    get_running_instructor_tasks,
+    regenerate_certificates,
     submit_bulk_course_email,
+    submit_calculate_may_enroll_csv,
     submit_calculate_problem_responses_csv,
     submit_calculate_students_features_csv,
     submit_cohort_students,
-    submit_detailed_enrollment_features_csv,
-    submit_calculate_may_enroll_csv,
-    submit_executive_summary_report,
     submit_course_survey_report,
-    generate_certificates_for_students,
-    regenerate_certificates,
+    submit_delete_entrance_exam_state_for_student,
+    submit_delete_problem_state_for_all_students,
+    submit_detailed_enrollment_features_csv,
+    submit_executive_summary_report,
     submit_export_ora2_data,
-    SpecificStudentIdMissingError,
+    submit_rescore_entrance_exam_for_student,
+    submit_rescore_problem_for_all_students,
+    submit_rescore_problem_for_student,
+    submit_reset_problem_attempts_for_all_students,
+    submit_reset_problem_attempts_in_entrance_exam
 )
-
 from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError
-from lms.djangoapps.instructor_task.models import InstructorTask, PROGRESS
+from lms.djangoapps.instructor_task.models import PROGRESS, InstructorTask
 from lms.djangoapps.instructor_task.tasks import export_ora2_data
 from lms.djangoapps.instructor_task.tests.test_base import (
-    InstructorTaskTestCase,
+    TEST_COURSE_KEY,
     InstructorTaskCourseTestCase,
     InstructorTaskModuleTestCase,
-    TestReportMixin,
-    TEST_COURSE_KEY,
+    InstructorTaskTestCase,
+    TestReportMixin
 )
-from certificates.models import CertificateStatuses, CertificateGenerationHistory
+from xmodule.modulestore.exceptions import ItemNotFoundError
 
 
 class InstructorTaskReportTest(InstructorTaskTestCase):

lms/djangoapps/instructor_task/tests/test_base.py

@@ -2,36 +2,34 @@
 Base test classes for LMS instructor-initiated background tasks
 
 """
+import json
 # pylint: disable=attribute-defined-outside-init
 import os
-import json
-from mock import Mock, patch
 import shutil
 from tempfile import mkdtemp
-import unicodecsv
 from uuid import uuid4
 
-from celery.states import SUCCESS, FAILURE
-from django.core.urlresolvers import reverse
+import unicodecsv
+from celery.states import FAILURE, SUCCESS
 from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from mock import Mock, patch
+from opaque_keys.edx.locations import Location, SlashSeparatedCourseKey
 
 from capa.tests.response_xml_factory import OptionResponseXMLFactory
 from courseware.model_data import StudentModule
 from courseware.tests.tests import LoginEnrollmentTestCase
-from opaque_keys.edx.locations import Location, SlashSeparatedCourseKey
+from lms.djangoapps.instructor_task.api_helper import encode_problem_and_student_input
+from lms.djangoapps.instructor_task.models import PROGRESS, QUEUING, ReportStore
+from lms.djangoapps.instructor_task.tests.factories import InstructorTaskFactory
+from lms.djangoapps.instructor_task.views import instructor_task_status
 from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
 from openedx.core.lib.url_utils import quote_slashes
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-
-from lms.djangoapps.instructor_task.api_helper import encode_problem_and_student_input
-from lms.djangoapps.instructor_task.models import PROGRESS, QUEUING, ReportStore
-from lms.djangoapps.instructor_task.tests.factories import InstructorTaskFactory
-from lms.djangoapps.instructor_task.views import instructor_task_status
-
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
 TEST_COURSE_ORG = 'edx'
 TEST_COURSE_NAME = 'test_course'

lms/djangoapps/instructor_task/tests/test_integration.py

@@ -5,45 +5,41 @@ Runs tasks on answers to course problems to validate that code
 paths actually work.
 
 """
-from collections import namedtuple
-import ddt
 import json
 import logging
-from mock import patch
-from nose.plugins.attrib import attr
 import textwrap
+from collections import namedtuple
 
-from celery.states import SUCCESS, FAILURE
+import ddt
+from celery.states import FAILURE, SUCCESS
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
+from mock import patch
+from nose.plugins.attrib import attr
 
-from openedx.core.djangoapps.util.testing import TestConditionalContent
-from openedx.core.djangolib.testing.utils import get_mock_request
-from capa.tests.response_xml_factory import (CodeResponseXMLFactory,
-                                             CustomResponseXMLFactory)
-from xmodule.modulestore.tests.factories import ItemFactory
-from xmodule.modulestore import ModuleStoreEnum
-
+from capa.responsetypes import StudentInputError
+from capa.tests.response_xml_factory import CodeResponseXMLFactory, CustomResponseXMLFactory
 from courseware.model_data import StudentModule
-
+from lms.djangoapps.grades.new.course_grade_factory import CourseGradeFactory
 from lms.djangoapps.instructor_task.api import (
+    submit_delete_problem_state_for_all_students,
     submit_rescore_problem_for_all_students,
     submit_rescore_problem_for_student,
-    submit_reset_problem_attempts_for_all_students,
-    submit_delete_problem_state_for_all_students
+    submit_reset_problem_attempts_for_all_students
 )
 from lms.djangoapps.instructor_task.models import InstructorTask
 from lms.djangoapps.instructor_task.tasks_helper.grades import CourseGradeReport
 from lms.djangoapps.instructor_task.tests.test_base import (
-    InstructorTaskModuleTestCase,
-    TestReportMixin,
     OPTION_1,
     OPTION_2,
+    InstructorTaskModuleTestCase,
+    TestReportMixin
 )
-from capa.responsetypes import StudentInputError
-from lms.djangoapps.grades.new.course_grade_factory import CourseGradeFactory
+from openedx.core.djangoapps.util.testing import TestConditionalContent
+from openedx.core.djangolib.testing.utils import get_mock_request
 from openedx.core.lib.url_utils import quote_slashes
-
+from xmodule.modulestore import ModuleStoreEnum
+from xmodule.modulestore.tests.factories import ItemFactory
 
 log = logging.getLogger(__name__)
 

lms/djangoapps/instructor_task/tests/test_models.py

@@ -2,18 +2,18 @@
 Tests for instructor_task/models.py.
 """
 import copy
-from cStringIO import StringIO
 import time
+from cStringIO import StringIO
 
 import boto
 from django.conf import settings
-from django.test import SimpleTestCase, override_settings, TestCase
+from django.test import SimpleTestCase, TestCase, override_settings
 from mock import patch
+from opaque_keys.edx.locator import CourseLocator
 
 from common.test.utils import MockS3Mixin
 from lms.djangoapps.instructor_task.models import ReportStore
 from lms.djangoapps.instructor_task.tests.test_base import TestReportMixin
-from opaque_keys.edx.locator import CourseLocator
 
 
 class ReportStoreTestMixin(object):

lms/djangoapps/instructor_task/tests/test_subtasks.py

@@ -5,11 +5,10 @@ from uuid import uuid4
 
 from mock import Mock, patch
 
-from student.models import CourseEnrollment
-
 from lms.djangoapps.instructor_task.subtasks import queue_subtasks_for_query
 from lms.djangoapps.instructor_task.tests.factories import InstructorTaskFactory
 from lms.djangoapps.instructor_task.tests.test_base import InstructorTaskCourseTestCase
+from student.models import CourseEnrollment
 
 
 class TestSubtasks(InstructorTaskCourseTestCase):

lms/djangoapps/instructor_task/tests/test_tasks.py

@@ -5,36 +5,33 @@ Runs tasks on answers to course problems to validate that code
 paths actually work.
 """
 
-from functools import partial
 import json
+from functools import partial
 from uuid import uuid4
 
-from celery.states import SUCCESS, FAILURE
 import ddt
+from celery.states import FAILURE, SUCCESS
 from django.utils.translation import ugettext_noop
-from mock import Mock, MagicMock, patch
+from mock import MagicMock, Mock, patch
 from nose.plugins.attrib import attr
-
 from opaque_keys.edx.locations import i4xEncoder
 
 from courseware.models import StudentModule
 from courseware.tests.factories import StudentModuleFactory
-from student.tests.factories import UserFactory, CourseEnrollmentFactory
-from xmodule.modulestore.exceptions import ItemNotFoundError
-
 from lms.djangoapps.instructor_task.exceptions import UpdateProblemModuleStateError
 from lms.djangoapps.instructor_task.models import InstructorTask
-from lms.djangoapps.instructor_task.tests.test_base import InstructorTaskModuleTestCase
-from lms.djangoapps.instructor_task.tests.factories import InstructorTaskFactory
 from lms.djangoapps.instructor_task.tasks import (
-    rescore_problem,
-    reset_problem_attempts,
     delete_problem_state,
-    generate_certificates,
     export_ora2_data,
+    generate_certificates,
+    rescore_problem,
+    reset_problem_attempts
 )
 from lms.djangoapps.instructor_task.tasks_helper.misc import upload_ora2_data
-
+from lms.djangoapps.instructor_task.tests.factories import InstructorTaskFactory
+from lms.djangoapps.instructor_task.tests.test_base import InstructorTaskModuleTestCase
+from student.tests.factories import CourseEnrollmentFactory, UserFactory
+from xmodule.modulestore.exceptions import ItemNotFoundError
 
 PROBLEM_URL_NAME = "test_urlname"
 

lms/djangoapps/instructor_task/tests/test_tasks_helper.py

@@ -10,81 +10,80 @@ Unit tests for LMS instructor-initiated background tasks helper functions.
 
 import os
 import shutil
-from datetime import datetime
+import tempfile
 import urllib
+from datetime import datetime
 
+import ddt
+import unicodecsv
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
-import ddt
 from freezegun import freeze_time
-from mock import Mock, patch, MagicMock
+from mock import MagicMock, Mock, patch
 from nose.plugins.attrib import attr
 from pytz import UTC
-import tempfile
-import unicodecsv
 
+import openedx.core.djangoapps.user_api.course_tag.api as course_tag_api
 from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
 from certificates.models import CertificateStatuses, GeneratedCertificate
-from certificates.tests.factories import GeneratedCertificateFactory, CertificateWhitelistFactory
+from certificates.tests.factories import CertificateWhitelistFactory, GeneratedCertificateFactory
 from course_modes.models import CourseMode
 from courseware.tests.factories import InstructorFactory
 from instructor_analytics.basic import UNAVAILABLE
 from lms.djangoapps.grades.models import PersistentCourseGrade
 from lms.djangoapps.grades.transformer import GradesTransformer
-from lms.djangoapps.teams.tests.factories import CourseTeamFactory, CourseTeamMembershipFactory
-from lms.djangoapps.verify_student.tests.factories import SoftwareSecurePhotoVerificationFactory
-from openedx.core.djangoapps.course_groups.models import CourseUserGroupPartitionGroup, CohortMembership
-from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory
-from openedx.core.djangoapps.credit.tests.factories import CreditCourseFactory
-import openedx.core.djangoapps.user_api.course_tag.api as course_tag_api
-from openedx.core.djangoapps.user_api.partition_schemes import RandomUserPartitionScheme
-from openedx.core.djangoapps.util.testing import ContentGroupTestCase, TestConditionalContent
-from request_cache.middleware import RequestCache
-from shoppingcart.models import (
-    Order, PaidCourseRegistration, CourseRegistrationCode, Invoice,
-    CourseRegistrationCodeInvoiceItem, InvoiceTransaction, Coupon
-)
-from student.models import CourseEnrollment, CourseEnrollmentAllowed, ManualEnrollmentAudit, ALLOWEDTOENROLL_TO_ENROLLED
-from student.tests.factories import CourseEnrollmentFactory, CourseModeFactory, UserFactory
-from survey.models import SurveyForm, SurveyAnswer
-from xmodule.modulestore import ModuleStoreEnum
-from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, check_mongo_calls
-from xmodule.partitions.partitions import Group, UserPartition
-
-from ..models import ReportStore
-from lms.djangoapps.instructor_task.tasks_helper.certs import (
-    generate_students_certificates,
-)
+from lms.djangoapps.instructor_task.tasks_helper.certs import generate_students_certificates
 from lms.djangoapps.instructor_task.tasks_helper.enrollments import (
     upload_enrollment_report,
-    upload_may_enroll_csv,
     upload_exec_summary_report,
-    upload_students_csv,
+    upload_may_enroll_csv,
+    upload_students_csv
 )
 from lms.djangoapps.instructor_task.tasks_helper.grades import (
     ENROLLED_IN_COURSE,
     NOT_ENROLLED_IN_COURSE,
     CourseGradeReport,
     ProblemGradeReport,
-    ProblemResponses,
+    ProblemResponses
 )
 from lms.djangoapps.instructor_task.tasks_helper.misc import (
     cohort_students_and_upload,
     upload_course_survey_report,
-    upload_ora2_data,
+    upload_ora2_data
 )
-from ..tasks_helper.utils import (
-    UPDATE_STATUS_FAILED,
-    UPDATE_STATUS_SUCCEEDED,
-)
-
 from lms.djangoapps.instructor_task.tests.test_base import (
     InstructorTaskCourseTestCase,
-    TestReportMixin,
-    InstructorTaskModuleTestCase
+    InstructorTaskModuleTestCase,
+    TestReportMixin
 )
+from lms.djangoapps.teams.tests.factories import CourseTeamFactory, CourseTeamMembershipFactory
+from lms.djangoapps.verify_student.tests.factories import SoftwareSecurePhotoVerificationFactory
+from openedx.core.djangoapps.course_groups.models import CohortMembership, CourseUserGroupPartitionGroup
+from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory
+from openedx.core.djangoapps.credit.tests.factories import CreditCourseFactory
+from openedx.core.djangoapps.user_api.partition_schemes import RandomUserPartitionScheme
+from openedx.core.djangoapps.util.testing import ContentGroupTestCase, TestConditionalContent
+from request_cache.middleware import RequestCache
+from shoppingcart.models import (
+    Coupon,
+    CourseRegistrationCode,
+    CourseRegistrationCodeInvoiceItem,
+    Invoice,
+    InvoiceTransaction,
+    Order,
+    PaidCourseRegistration
+)
+from student.models import ALLOWEDTOENROLL_TO_ENROLLED, CourseEnrollment, CourseEnrollmentAllowed, ManualEnrollmentAudit
+from student.tests.factories import CourseEnrollmentFactory, CourseModeFactory, UserFactory
+from survey.models import SurveyAnswer, SurveyForm
+from xmodule.modulestore import ModuleStoreEnum
+from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, check_mongo_calls
+from xmodule.partitions.partitions import Group, UserPartition
+
+from ..models import ReportStore
+from ..tasks_helper.utils import UPDATE_STATUS_FAILED, UPDATE_STATUS_SUCCEEDED
 
 
 class InstructorGradeReportTestCase(TestReportMixin, InstructorTaskCourseTestCase):

lms/djangoapps/instructor_task/tests/test_views.py

@@ -3,19 +3,18 @@
 Test for LMS instructor background task views.
 """
 import json
-from celery.states import SUCCESS, FAILURE, REVOKED, PENDING
-
-from mock import Mock, patch
 
+from celery.states import FAILURE, PENDING, REVOKED, SUCCESS
 from django.http import QueryDict
+from mock import Mock, patch
 
 from lms.djangoapps.instructor_task.models import PROGRESS
 from lms.djangoapps.instructor_task.tests.test_base import (
-    InstructorTaskTestCase,
+    TEST_FAILURE_EXCEPTION,
     TEST_FAILURE_MESSAGE,
-    TEST_FAILURE_EXCEPTION
+    InstructorTaskTestCase
 )
-from lms.djangoapps.instructor_task.views import instructor_task_status, get_task_completion_info
+from lms.djangoapps.instructor_task.views import get_task_completion_info, instructor_task_status
 
 
 class InstructorTaskReportTest(InstructorTaskTestCase):