Updating paths to CourseKey and friends

cms/djangoapps/contentstore/views/tests/test_captions.py

@@ -18,7 +18,7 @@ from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.django import contentstore, _CONTENTSTORE
 from xmodule.contentstore.content import StaticContent
 from xmodule.exceptions import NotFoundError
-from xmodule.modulestore.keys import UsageKey
+from opaque_keys.edx.keys import UsageKey
 
 from contentstore.tests.modulestore_config import TEST_MODULESTORE
 

cms/djangoapps/contentstore/views/utilities/captions.py

@@ -17,8 +17,8 @@ from opaque_keys import InvalidKeyError
 from util.json_request import JsonResponse
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError, InsufficientSpecificationError
-from xmodule.modulestore.keys import CourseKey
-from xmodule.modulestore.keys import UsageKey
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.keys import UsageKey
 from xmodule.video_module.transcripts_utils import (
                                     GetTranscriptsFromYouTubeException,
                                     TranscriptsRequestValidationException,

cms/djangoapps/contentstore/views/utility.py

@@ -11,7 +11,7 @@ from util.json_request import JsonResponse
 
 from contentstore.utils import reverse_course_url
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.keys import CourseKey
+from opaque_keys.edx.keys import CourseKey
 
 from .access import has_course_access
 

common/djangoapps/external_auth/views.py

@@ -48,7 +48,7 @@ import student.views
 from xmodule.modulestore.django import modulestore
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.exceptions import ItemNotFoundError
-from xmodule.modulestore.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 log = logging.getLogger("edx.external_auth")
 AUDIT_LOG = logging.getLogger("audit")