Fix import order issues in contentstore

This commit is contained in:
Jeremy Bowman
2019-02-14 14:20:47 -05:00
parent 1817e61ca4
commit d866fed2f1
9 changed files with 27 additions and 26 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)