diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_export.py b/cms/djangoapps/contentstore/management/commands/tests/test_export.py index a65827bb55..32123455c0 100644 --- a/cms/djangoapps/contentstore/management/commands/tests/test_export.py +++ b/cms/djangoapps/contentstore/management/commands/tests/test_export.py @@ -1,16 +1,17 @@ """ Tests for exporting courseware to the desired path """ -import unittest import shutil -import ddt -from django.core.management import CommandError, call_command +import unittest from tempfile import mkdtemp -from xmodule.modulestore.tests.factories import CourseFactory +import ddt +from django.core.management import CommandError, call_command + from xmodule.modulestore import ModuleStoreEnum -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.django import modulestore +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory class TestArgParsingCourseExport(unittest.TestCase): diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_export_olx.py b/cms/djangoapps/contentstore/management/commands/tests/test_export_olx.py index 4b0b73ea1b..ebfe27ff77 100644 --- a/cms/djangoapps/contentstore/management/commands/tests/test_export_olx.py +++ b/cms/djangoapps/contentstore/management/commands/tests/test_export_olx.py @@ -2,20 +2,20 @@ Tests for exporting OLX content. """ -import ddt -from path import Path as path import shutil -from StringIO import StringIO import tarfile -from tempfile import mkdtemp import unittest +from StringIO import StringIO +from tempfile import mkdtemp +import ddt from django.core.management import CommandError, call_command +from path import Path as path -from xmodule.modulestore.tests.factories import CourseFactory from xmodule.modulestore import ModuleStoreEnum -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.django import modulestore +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory class TestArgParsingCourseExportOlx(unittest.TestCase): diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_import.py b/cms/djangoapps/contentstore/management/commands/tests/test_import.py index 8686ab8eb6..9de6975924 100644 --- a/cms/djangoapps/contentstore/management/commands/tests/test_import.py +++ b/cms/djangoapps/contentstore/management/commands/tests/test_import.py @@ -3,15 +3,15 @@ Unittests for importing a course via management command """ import os -from path import Path as path import shutil import tempfile from django.core.management import call_command +from path import Path as path from django_comment_common.utils import are_permissions_roles_seeded -from xmodule.modulestore.django import modulestore from xmodule.modulestore import ModuleStoreEnum +from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py index f6d4bf9307..7d7986ad12 100644 --- a/cms/djangoapps/contentstore/signals/handlers.py +++ b/cms/djangoapps/contentstore/signals/handlers.py @@ -15,9 +15,9 @@ from openedx.core.djangoapps.credit.signals import on_course_publish from openedx.core.lib.gating import api as gating_api from track.event_transaction_utils import get_event_transaction_id, get_event_transaction_type from util.module_utils import yield_dynamic_descriptor_descendants -from .signals import GRADING_POLICY_CHANGED from xmodule.modulestore.django import SignalHandler, modulestore +from .signals import GRADING_POLICY_CHANGED log = logging.getLogger(__name__) diff --git a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py index 84395590af..c1323126be 100644 --- a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py +++ b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- """ Tests for transcripts_utils. """ import copy -import tempfile -import ddt import json +import tempfile import textwrap import unittest from uuid import uuid4 +import ddt import pytest from django.conf import settings from django.test.utils import override_settings @@ -16,12 +16,12 @@ from mock import Mock, patch from six import text_type from contentstore.tests.utils import mock_requests_get +from student.tests.factories import UserFactory from xmodule.contentstore.content import StaticContent from xmodule.contentstore.django import contentstore from xmodule.exceptions import NotFoundError from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory -from student.tests.factories import UserFactory from xmodule.video_module import transcripts_utils TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE) diff --git a/cms/djangoapps/contentstore/views/import_export.py b/cms/djangoapps/contentstore/views/import_export.py index 97bad89051..d519a608fe 100644 --- a/cms/djangoapps/contentstore/views/import_export.py +++ b/cms/djangoapps/contentstore/views/import_export.py @@ -8,6 +8,7 @@ import logging import os import re import shutil +from wsgiref.util import FileWrapper from django.conf import settings from django.contrib.auth.decorators import login_required @@ -26,7 +27,6 @@ from six import text_type from storages.backends.s3boto import S3BotoStorage from user_tasks.conf import settings as user_tasks_settings from user_tasks.models import UserTaskArtifact, UserTaskStatus -from wsgiref.util import FileWrapper from contentstore.storage import course_import_export_storage from contentstore.tasks import CourseExportTask, CourseImportTask, export_olx, import_olx diff --git a/cms/djangoapps/contentstore/views/tests/test_gating.py b/cms/djangoapps/contentstore/views/tests/test_gating.py index 887e56f8eb..454cc17bcc 100644 --- a/cms/djangoapps/contentstore/views/tests/test_gating.py +++ b/cms/djangoapps/contentstore/views/tests/test_gating.py @@ -1,9 +1,9 @@ """ Unit tests for the gating feature in Studio """ -import ddt import json +import ddt from mock import patch from contentstore.tests.utils import CourseTestCase diff --git a/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py b/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py index 8d55c02bb9..f2f7ef9f20 100644 --- a/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py +++ b/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -import ddt import json from io import BytesIO -from mock import Mock, patch, ANY +import ddt from django.test.testcases import TestCase from django.urls import reverse from edxval import api +from mock import ANY, Mock, patch from contentstore.tests.utils import CourseTestCase from contentstore.utils import reverse_course_url diff --git a/cms/djangoapps/contentstore/views/tests/test_transcripts.py b/cms/djangoapps/contentstore/views/tests/test_transcripts.py index 009fd08506..05e03aebd6 100644 --- a/cms/djangoapps/contentstore/views/tests/test_transcripts.py +++ b/cms/djangoapps/contentstore/views/tests/test_transcripts.py @@ -1,18 +1,18 @@ """Tests for items views.""" import copy -from codecs import BOM_UTF8 -import ddt import json -from mock import patch, Mock import tempfile import textwrap +from codecs import BOM_UTF8 from uuid import uuid4 +import ddt from django.conf import settings -from django.urls import reverse from django.test.utils import override_settings +from django.urls import reverse from edxval.api import create_video +from mock import Mock, patch from opaque_keys.edx.keys import UsageKey from contentstore.tests.utils import CourseTestCase, mock_requests_get @@ -23,9 +23,9 @@ from xmodule.exceptions import NotFoundError from xmodule.modulestore.django import modulestore from xmodule.video_module.transcripts_utils import ( GetTranscriptsFromYouTubeException, + Transcript, get_video_transcript_content, remove_subs_from_store, - Transcript, ) TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE)