diff --git a/cms/djangoapps/contentstore/course_info_model.py b/cms/djangoapps/contentstore/course_info_model.py index 7ba75ff215..570763bd28 100644 --- a/cms/djangoapps/contentstore/course_info_model.py +++ b/cms/djangoapps/contentstore/course_info_model.py @@ -22,7 +22,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore.django import modulestore from xmodule.html_module import CourseInfoModule -from xmodule_modifiers import get_course_update_items +from openedx.core.lib.xblock_utils import get_course_update_items from cms.djangoapps.contentstore.push_notification import enqueue_push_course_update # # This should be in a class which inherits from XmlDescriptor diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py index a50cbc2e16..ae197ee0f2 100644 --- a/cms/djangoapps/contentstore/views/item.py +++ b/cms/djangoapps/contentstore/views/item.py @@ -11,7 +11,7 @@ import json from collections import OrderedDict from functools import partial from static_replace import replace_static_urls -from xmodule_modifiers import wrap_xblock, request_token +from openedx.core.lib.xblock_utils import wrap_xblock, request_token import dogstats_wrapper as dog_stats_api from django.conf import settings diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py index 83ad1f6d65..7305eb248a 100644 --- a/cms/djangoapps/contentstore/views/preview.py +++ b/cms/djangoapps/contentstore/views/preview.py @@ -9,7 +9,7 @@ from django.http import Http404, HttpResponseBadRequest from django.contrib.auth.decorators import login_required from edxmako.shortcuts import render_to_string -from xmodule_modifiers import replace_static_urls, wrap_xblock, wrap_fragment, request_token +from openedx.core.lib.xblock_utils import replace_static_urls, wrap_xblock, wrap_fragment, request_token from xmodule.x_module import PREVIEW_VIEWS, STUDENT_VIEW, AUTHOR_VIEW from xmodule.contentstore.django import contentstore from xmodule.error_module import ErrorDescriptor diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index f381edd3fc..720304ac51 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -57,7 +57,7 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey from xmodule.contentstore.django import contentstore from xmodule.modulestore.django import modulestore, ModuleI18nService from xmodule.modulestore.exceptions import ItemNotFoundError -from xmodule_modifiers import ( +from openedx.core.lib.xblock_utils import ( replace_course_urls, replace_jump_to_id_urls, replace_static_urls, diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py index b8f4bebc93..68117b06f4 100644 --- a/lms/djangoapps/courseware/tests/test_module_render.py +++ b/lms/djangoapps/courseware/tests/test_module_render.py @@ -1000,7 +1000,7 @@ class TestStaffDebugInfo(ModuleStoreTestCase): self.user, self.descriptor ) - with patch('xmodule_modifiers.grade_histogram') as mock_grade_histogram: + with patch('openedx.core.lib.xblock_utils.grade_histogram') as mock_grade_histogram: mock_grade_histogram.return_value = [] module = render.get_module( self.user, @@ -1022,7 +1022,7 @@ class TestStaffDebugInfo(ModuleStoreTestCase): max_grade=1, state="{}", ) - with patch('xmodule_modifiers.grade_histogram') as mock_grade_histogram: + with patch('openedx.core.lib.xblock_utils.grade_histogram') as mock_grade_histogram: mock_grade_histogram.return_value = [] module = render.get_module( self.user, diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py index c91a8d3855..4399cc6dff 100644 --- a/lms/djangoapps/instructor/views/instructor_dashboard.py +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -23,7 +23,7 @@ from util.json_request import JsonResponse from mock import patch from lms.djangoapps.lms_xblock.runtime import quote_slashes -from xmodule_modifiers import wrap_xblock +from openedx.core.lib.xblock_utils import wrap_xblock from xmodule.html_module import HtmlDescriptor from xmodule.modulestore.django import modulestore from xblock.field_data import DictFieldData diff --git a/lms/djangoapps/mobile_api/course_info/views.py b/lms/djangoapps/mobile_api/course_info/views.py index 87bd97ecc0..764a580fc6 100644 --- a/lms/djangoapps/mobile_api/course_info/views.py +++ b/lms/djangoapps/mobile_api/course_info/views.py @@ -7,7 +7,7 @@ from rest_framework.response import Response from courseware.courses import get_course_about_section, get_course_info_section_module from static_replace import make_static_urls_absolute, replace_static_urls -from xmodule_modifiers import get_course_update_items +from openedx.core.lib.xblock_utils import get_course_update_items from ..utils import mobile_view, mobile_course_access diff --git a/common/djangoapps/xmodule_modifiers.py b/openedx/core/lib/xblock_utils.py similarity index 100% rename from common/djangoapps/xmodule_modifiers.py rename to openedx/core/lib/xblock_utils.py