diff --git a/cms/djangoapps/contentstore/tests/test_core_caching.py b/cms/djangoapps/contentstore/tests/test_core_caching.py index 622afd2110..f93e1222d2 100644 --- a/cms/djangoapps/contentstore/tests/test_core_caching.py +++ b/cms/djangoapps/contentstore/tests/test_core_caching.py @@ -1,5 +1,5 @@ from cache_toolbox.core import get_cached_content, set_cached_content, del_cached_content -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.contentstore.content import StaticContent from django.test import TestCase diff --git a/cms/djangoapps/contentstore/tests/test_users_default_role.py b/cms/djangoapps/contentstore/tests/test_users_default_role.py index b5928d594b..26ec08ab94 100644 --- a/cms/djangoapps/contentstore/tests/test_users_default_role.py +++ b/cms/djangoapps/contentstore/tests/test_users_default_role.py @@ -5,7 +5,6 @@ after deleting it creates same course again from contentstore.tests.utils import AjaxEnabledTestClient from contentstore.utils import delete_course_and_groups, reverse_url from courseware.tests.factories import UserFactory -from xmodule.modulestore import Location from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from opaque_keys.edx.locations import SlashSeparatedCourseKey diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py index d8e338755f..2b8f389764 100644 --- a/cms/djangoapps/models/settings/course_details.py +++ b/cms/djangoapps/models/settings/course_details.py @@ -4,7 +4,7 @@ import datetime import json from json.encoder import JSONEncoder -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.modulestore.exceptions import ItemNotFoundError from contentstore.utils import get_modulestore, course_image_url from models.settings import course_grading diff --git a/common/djangoapps/contentserver/middleware.py b/common/djangoapps/contentserver/middleware.py index 056a1ce459..0eac924f84 100644 --- a/common/djangoapps/contentserver/middleware.py +++ b/common/djangoapps/contentserver/middleware.py @@ -4,7 +4,8 @@ from student.models import CourseEnrollment from xmodule.contentstore.django import contentstore from xmodule.contentstore.content import StaticContent, XASSET_LOCATION_TAG -from xmodule.modulestore import InvalidLocationError, InvalidKeyError +from xmodule.modulestore import InvalidLocationError +from opaque_keys import InvalidKeyError from cache_toolbox.core import get_cached_content, set_cached_content from xmodule.exceptions import NotFoundError diff --git a/common/djangoapps/external_auth/tests/test_ssl.py b/common/djangoapps/external_auth/tests/test_ssl.py index c601f8bdad..614a753459 100644 --- a/common/djangoapps/external_auth/tests/test_ssl.py +++ b/common/djangoapps/external_auth/tests/test_ssl.py @@ -23,7 +23,6 @@ from opaque_keys import InvalidKeyError from student.models import CourseEnrollment from student.roles import CourseStaffRole from student.tests.factories import UserFactory -from xmodule.modulestore import Location from xmodule.modulestore.django import loc_mapper from xmodule.modulestore.exceptions import InsufficientSpecificationError from xmodule.modulestore.tests.django_utils import (ModuleStoreTestCase, diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py index 37c7623602..7f816ad08d 100644 --- a/common/djangoapps/external_auth/views.py +++ b/common/djangoapps/external_auth/views.py @@ -47,7 +47,6 @@ from ratelimitbackend.exceptions import RateLimitException import student.views from xmodule.modulestore.django import modulestore from xmodule.course_module import CourseDescriptor -from xmodule.modulestore import Location from xmodule.modulestore.exceptions import ItemNotFoundError log = logging.getLogger("edx.external_auth") diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 39a3449ed1..02ba238120 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -53,7 +53,7 @@ from xmodule.course_module import CourseDescriptor from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore.django import modulestore from opaque_keys.edx.locations import SlashSeparatedCourseKey -from xmodule.modulestore import XML_MODULESTORE_TYPE, Location +from xmodule.modulestore import XML_MODULESTORE_TYPE from collections import namedtuple diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index c1e0baf5aa..478b69a194 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -8,7 +8,7 @@ from datetime import datetime import dateutil.parser from lazy import lazy -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.partitions.partitions import UserPartition from xmodule.seq_module import SequenceDescriptor, SequenceModule from xmodule.graders import grader_from_conf diff --git a/common/lib/xmodule/xmodule/modulestore/mixed.py b/common/lib/xmodule/xmodule/modulestore/mixed.py index 814f6816fb..4ea41b6678 100644 --- a/common/lib/xmodule/xmodule/modulestore/mixed.py +++ b/common/lib/xmodule/xmodule/modulestore/mixed.py @@ -11,7 +11,8 @@ from opaque_keys import InvalidKeyError from . import ModuleStoreWriteBase from xmodule.modulestore.django import create_modulestore_instance, loc_mapper -from xmodule.modulestore import Location, XML_MODULESTORE_TYPE +from opaque_keys.edx.locations import Location +from xmodule.modulestore import XML_MODULESTORE_TYPE from opaque_keys.edx.locator import CourseLocator, Locator, BlockUsageLocator from xmodule.modulestore.exceptions import ItemNotFoundError from opaque_keys.edx.keys import CourseKey, UsageKey diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py index 4af7785028..1e65b40390 100644 --- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py +++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py @@ -31,7 +31,8 @@ from xblock.runtime import KvsFieldData from xblock.exceptions import InvalidScopeError from xblock.fields import Scope, ScopeIds, Reference, ReferenceList, ReferenceValueDict -from xmodule.modulestore import ModuleStoreWriteBase, Location, MONGO_MODULESTORE_TYPE +from xmodule.modulestore import ModuleStoreWriteBase, MONGO_MODULESTORE_TYPE +from opaque_keys.edx.locations import Location from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError from xmodule.modulestore.inheritance import own_metadata, InheritanceMixin, inherit_metadata, InheritanceKeyValueStore from xmodule.tabs import StaticTab, CourseTabList diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py b/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py index ad0ae22d90..688f214f8b 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py @@ -3,7 +3,7 @@ Test the loc mapper store """ import unittest import uuid -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError from xmodule.modulestore.loc_mapper_store import LocMapperStore diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py index 2f2357b942..efc7ac1301 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py @@ -5,8 +5,8 @@ from mock import patch, Mock from importlib import import_module from xmodule.tests import DATA_DIR -from xmodule.modulestore import Location, MONGO_MODULESTORE_TYPE, SPLIT_MONGO_MODULESTORE_TYPE, \ - XML_MODULESTORE_TYPE +from opaque_keys.edx.locations import Location +from xmodule.modulestore import MONGO_MODULESTORE_TYPE, SPLIT_MONGO_MODULESTORE_TYPE, XML_MODULESTORE_TYPE from xmodule.modulestore.exceptions import ItemNotFoundError from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py index 962f47b711..b9de5a6b9d 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py @@ -18,7 +18,8 @@ from xblock.exceptions import InvalidScopeError from xblock.plugin import Plugin from xmodule.tests import DATA_DIR -from xmodule.modulestore import Location, MONGO_MODULESTORE_TYPE +from opaque_keys.edx.locations import Location +from xmodule.modulestore import MONGO_MODULESTORE_TYPE from xmodule.modulestore.mongo import MongoModuleStore, MongoKeyValueStore from xmodule.modulestore.draft import DraftModuleStore from opaque_keys.edx.locations import SlashSeparatedCourseKey, AssetLocation diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py index 878620f55c..85e6d55069 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py @@ -8,7 +8,8 @@ from glob import glob from mock import patch from xmodule.modulestore.xml import XMLModuleStore -from xmodule.modulestore import Location, XML_MODULESTORE_TYPE +from opaque_keys.edx.locations import Location +from xmodule.modulestore import XML_MODULESTORE_TYPE from .test_modulestore import check_path_to_location from xmodule.tests import DATA_DIR diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py b/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py index 37e4b9ef3f..e1d4a6a7f2 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py @@ -6,7 +6,7 @@ from xblock.core import XBlock from xblock.fields import String, Scope, ScopeIds from xblock.runtime import Runtime, KvsFieldData, DictKeyValueStore from xmodule.x_module import XModuleMixin -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.modulestore.inheritance import InheritanceMixin from xmodule.modulestore.xml_importer import import_module from opaque_keys.edx.locations import SlashSeparatedCourseKey diff --git a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py index 428cf0dcb6..967448d8db 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py +++ b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py @@ -7,7 +7,7 @@ import lxml.etree from xblock.fields import Scope from xmodule.contentstore.content import StaticContent from xmodule.exceptions import NotFoundError -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.modulestore.inheritance import own_metadata from fs.osfs import OSFS from json import dumps diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py index aea1672b4e..a113e8e277 100644 --- a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py +++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py @@ -8,7 +8,7 @@ from mock import Mock from xblock.field_data import DictFieldData from xblock.fields import ScopeIds from xmodule.annotatable_module import AnnotatableModule -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from . import get_test_system diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py index 2e6c92d388..3cef6ba6e8 100644 --- a/common/lib/xmodule/xmodule/tests/test_capa_module.py +++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py @@ -24,7 +24,7 @@ from capa.responsetypes import (StudentInputError, LoncapaProblemError, ResponseError) from capa.xqueue_interface import XQueueInterface from xmodule.capa_module import CapaModule, ComplexEncoder -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xblock.field_data import DictFieldData from xblock.fields import ScopeIds diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py index 244d4a2da5..e74d6d16c2 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -22,7 +22,7 @@ from xmodule.open_ended_grading_classes.open_ended_module import OpenEndedModule from xmodule.open_ended_grading_classes.self_assessment_module import SelfAssessmentModule from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module from xmodule.combined_open_ended_module import CombinedOpenEndedModule -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.tests import get_test_system, test_util_open_ended from xmodule.progress import Progress from xmodule.tests.test_util_open_ended import ( diff --git a/common/lib/xmodule/xmodule/tests/test_delay_between_attempts.py b/common/lib/xmodule/xmodule/tests/test_delay_between_attempts.py index 8235db2280..9a239f0860 100644 --- a/common/lib/xmodule/xmodule/tests/test_delay_between_attempts.py +++ b/common/lib/xmodule/xmodule/tests/test_delay_between_attempts.py @@ -15,7 +15,7 @@ from mock import Mock import xmodule from xmodule.capa_module import CapaModule -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xblock.field_data import DictFieldData from xblock.fields import ScopeIds diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py index d1b2edb4c2..aca3b889d8 100644 --- a/common/lib/xmodule/xmodule/tests/test_export.py +++ b/common/lib/xmodule/xmodule/tests/test_export.py @@ -22,7 +22,7 @@ from xblock.core import XBlock from xblock.fields import String, Scope, Integer from xblock.test.tools import blocks_are_equivalent -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.modulestore.xml import XMLModuleStore from xmodule.modulestore.xml_exporter import ( EdxJSONEncoder, convert_between_versions, get_version diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py index 06ada7350f..466957b4b5 100644 --- a/common/lib/xmodule/xmodule/tests/test_import.py +++ b/common/lib/xmodule/xmodule/tests/test_import.py @@ -11,7 +11,8 @@ from mock import Mock, patch from django.utils.timezone import UTC from xmodule.xml_module import is_pointer_tag -from xmodule.modulestore import Location, only_xmodules +from opaque_keys.edx.locations import Location +from xmodule.modulestore import only_xmodules from xmodule.modulestore.xml import ImportSystem, XMLModuleStore from xmodule.modulestore.inheritance import compute_inherited_metadata from xmodule.x_module import XModuleMixin diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py index e6d77f9a46..5674fdbba3 100644 --- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py +++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py @@ -6,7 +6,7 @@ from webob.multidict import MultiDict from pytz import UTC from xblock.fields import ScopeIds from xmodule.open_ended_grading_classes.self_assessment_module import SelfAssessmentModule -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from lxml import etree from . import get_test_system diff --git a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py index 0316b7cacc..c40a7a9a5d 100644 --- a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py @@ -1,6 +1,5 @@ import json from textwrap import dedent -from xmodule.modulestore import Location from xmodule.modulestore.xml import XMLModuleStore from xmodule.tests import DATA_DIR, get_test_system diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/common/lib/xmodule/xmodule/tests/test_video.py index 314869c028..1469fe33e0 100644 --- a/common/lib/xmodule/xmodule/tests/test_video.py +++ b/common/lib/xmodule/xmodule/tests/test_video.py @@ -19,7 +19,7 @@ from mock import Mock from . import LogicTest from lxml import etree -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.video_module import VideoDescriptor, create_youtube_string, get_ext from .test_import import DummySystem from xblock.field_data import DictFieldData diff --git a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py index 8183122eae..37c812a5c2 100644 --- a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py +++ b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py @@ -24,7 +24,7 @@ from unittest.case import SkipTest, TestCase from xblock.field_data import DictFieldData from xblock.fields import ScopeIds -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.x_module import ModuleSystem, XModule, XModuleDescriptor, DescriptorSystem from xmodule.annotatable_module import AnnotatableDescriptor diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py index 1dcefa3c1a..af4a9a0796 100644 --- a/lms/djangoapps/bulk_email/tasks.py +++ b/lms/djangoapps/bulk_email/tasks.py @@ -45,7 +45,6 @@ from instructor_task.subtasks import ( check_subtask_is_valid, update_subtask_status, ) -from xmodule.modulestore import Location from util.query import use_read_replica_if_available log = get_task_logger(__name__) diff --git a/lms/djangoapps/certificates/queue.py b/lms/djangoapps/certificates/queue.py index 105eab04e4..719a89b7f8 100644 --- a/lms/djangoapps/certificates/queue.py +++ b/lms/djangoapps/certificates/queue.py @@ -17,7 +17,6 @@ import random import logging import lxml from lxml.etree import XMLSyntaxError, ParserError -from xmodule.modulestore import Location logger = logging.getLogger(__name__) diff --git a/lms/djangoapps/class_dashboard/dashboard_data.py b/lms/djangoapps/class_dashboard/dashboard_data.py index 43a72f0828..bd203a0ad5 100644 --- a/lms/djangoapps/class_dashboard/dashboard_data.py +++ b/lms/djangoapps/class_dashboard/dashboard_data.py @@ -12,7 +12,7 @@ from xmodule.modulestore.django import modulestore from xmodule.modulestore.inheritance import own_metadata from analytics.csvs import create_csv_response -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location # Used to limit the length of list displayed to the screen. MAX_SCREEN_LIST_LENGTH = 250 diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py index 251e56c8eb..6f11943923 100644 --- a/lms/djangoapps/courseware/access.py +++ b/lms/djangoapps/courseware/access.py @@ -9,7 +9,7 @@ from django.contrib.auth.models import AnonymousUser from xmodule.course_module import CourseDescriptor from xmodule.error_module import ErrorDescriptor -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.x_module import XModule from xblock.core import XBlock diff --git a/lms/djangoapps/courseware/features/common.py b/lms/djangoapps/courseware/features/common.py index 736068ace3..91ab23da56 100644 --- a/lms/djangoapps/courseware/features/common.py +++ b/lms/djangoapps/courseware/features/common.py @@ -10,7 +10,6 @@ from lettuce.django import django_url from django.contrib.auth.models import User from django.core.urlresolvers import reverse from student.models import CourseEnrollment -from xmodule.modulestore import Location from xmodule.modulestore.django import modulestore from opaque_keys.edx.locations import SlashSeparatedCourseKey from xmodule.course_module import CourseDescriptor diff --git a/lms/djangoapps/courseware/tests/__init__.py b/lms/djangoapps/courseware/tests/__init__.py index a8a1d21f10..ef88da053d 100644 --- a/lms/djangoapps/courseware/tests/__init__.py +++ b/lms/djangoapps/courseware/tests/__init__.py @@ -16,7 +16,7 @@ from student.tests.factories import UserFactory, CourseEnrollmentFactory from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE from xblock.field_data import DictFieldData from xmodule.tests import get_test_system, get_test_descriptor_system -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase diff --git a/lms/djangoapps/courseware/tests/test_lti_integration.py b/lms/djangoapps/courseware/tests/test_lti_integration.py index 558633d7a8..0d95fd0172 100644 --- a/lms/djangoapps/courseware/tests/test_lti_integration.py +++ b/lms/djangoapps/courseware/tests/test_lti_integration.py @@ -12,7 +12,6 @@ from django.conf import settings from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory -from xmodule.modulestore import Location from courseware.tests import BaseTestXmodule from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE diff --git a/lms/djangoapps/courseware/tests/test_video_handlers.py b/lms/djangoapps/courseware/tests/test_video_handlers.py index 06a2373c14..88e05823f2 100644 --- a/lms/djangoapps/courseware/tests/test_video_handlers.py +++ b/lms/djangoapps/courseware/tests/test_video_handlers.py @@ -11,7 +11,6 @@ from webob import Request from xmodule.contentstore.content import StaticContent from xmodule.contentstore.django import contentstore -from xmodule.modulestore import Location from xmodule.modulestore.django import editable_modulestore from . import BaseTestXmodule from .test_video_xml import SOURCE_XML diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py index b2b7491e65..632ce09afb 100644 --- a/lms/djangoapps/courseware/tests/test_video_mongo.py +++ b/lms/djangoapps/courseware/tests/test_video_mongo.py @@ -12,7 +12,6 @@ from xblock.field_data import DictFieldData from xmodule.video_module import create_youtube_string from xmodule.tests import get_test_descriptor_system -from xmodule.modulestore import Location from xmodule.video_module import VideoDescriptor from opaque_keys.edx.locations import SlashSeparatedCourseKey diff --git a/lms/djangoapps/courseware/tests/test_video_xml.py b/lms/djangoapps/courseware/tests/test_video_xml.py index 1c567e2ae5..5f9c87be16 100644 --- a/lms/djangoapps/courseware/tests/test_video_xml.py +++ b/lms/djangoapps/courseware/tests/test_video_xml.py @@ -16,7 +16,6 @@ course, section, subsection, unit, etc. """ from xmodule.video_module import VideoDescriptor -from xmodule.modulestore import Location from xmodule.tests import get_test_system, LogicTest, get_test_descriptor_system from xblock.field_data import DictFieldData from xblock.fields import ScopeIds diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index 83bb73768b..d235de4656 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -21,7 +21,7 @@ from student.models import CourseEnrollment from student.tests.factories import AdminFactory from edxmako.middleware import MakoMiddleware -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase diff --git a/lms/djangoapps/instructor/management/commands/openended_stats.py b/lms/djangoapps/instructor/management/commands/openended_stats.py index 3588d90010..8f0b48a731 100644 --- a/lms/djangoapps/instructor/management/commands/openended_stats.py +++ b/lms/djangoapps/instructor/management/commands/openended_stats.py @@ -7,7 +7,6 @@ import time from django.core.management.base import BaseCommand from optparse import make_option -from xmodule.modulestore import Location from xmodule.modulestore.django import modulestore from opaque_keys.edx.locations import SlashSeparatedCourseKey from xmodule.open_ended_grading_classes.openendedchild import OpenEndedChild diff --git a/lms/djangoapps/instructor/management/tests/test_openended_commands.py b/lms/djangoapps/instructor/management/tests/test_openended_commands.py index e996f05bba..8e83e54891 100644 --- a/lms/djangoapps/instructor/management/tests/test_openended_commands.py +++ b/lms/djangoapps/instructor/management/tests/test_openended_commands.py @@ -8,7 +8,7 @@ from pytz import UTC from django.test.utils import override_settings import capa.xqueue_interface as xqueue_interface -from xmodule.modulestore import Location +from opaque_keys.edx.locations import Location from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.open_ended_grading_classes.openendedchild import OpenEndedChild from xmodule.tests.test_util_open_ended import ( diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py index 6abfc12106..794ee66e29 100644 --- a/lms/djangoapps/instructor/views/api.py +++ b/lms/djangoapps/instructor/views/api.py @@ -69,7 +69,6 @@ from .tools import ( strip_if_string, bulk_email_is_enabled_for_course, ) -from xmodule.modulestore import Location from opaque_keys.edx.locations import SlashSeparatedCourseKey from opaque_keys import InvalidKeyError