From e6db0af1f1d906f79adb2973f8e6db86a576f321 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 24 Apr 2015 11:22:13 -0400 Subject: [PATCH] Use current OpaqueKeys methods when loading a block for the XQueue callback --- lms/djangoapps/courseware/module_render.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index 8776b2b4ae..827f33921d 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -728,11 +728,12 @@ def load_single_xblock(request, user_id, course_id, usage_key_string): """ Load a single XBlock identified by usage_key_string. """ - course_id = SlashSeparatedCourseKey.from_deprecated_string(course_id) - usage_key = course_id.make_usage_key_from_deprecated_string(usage_key_string) + usage_key = UsageKey.from_string(usage_key_string) + course_key = CourseKey.from_string(course_id) + usage_key = usage_key.map_into_course(course_key) user = User.objects.get(id=user_id) field_data_cache = FieldDataCache.cache_for_descriptor_descendents( - course_id, + course_key, user, modulestore().get_item(usage_key), depth=0,