Commit 7c704f39 by Ned Batchelder

Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py

parent 57143d60
...@@ -22,7 +22,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError ...@@ -22,7 +22,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from xmodule.html_module import CourseInfoModule 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 from cms.djangoapps.contentstore.push_notification import enqueue_push_course_update
# # This should be in a class which inherits from XmlDescriptor # # This should be in a class which inherits from XmlDescriptor
......
...@@ -11,7 +11,7 @@ import json ...@@ -11,7 +11,7 @@ import json
from collections import OrderedDict from collections import OrderedDict
from functools import partial from functools import partial
from static_replace import replace_static_urls 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 import dogstats_wrapper as dog_stats_api
from django.conf import settings from django.conf import settings
......
...@@ -9,7 +9,7 @@ from django.http import Http404, HttpResponseBadRequest ...@@ -9,7 +9,7 @@ from django.http import Http404, HttpResponseBadRequest
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from edxmako.shortcuts import render_to_string 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.x_module import PREVIEW_VIEWS, STUDENT_VIEW, AUTHOR_VIEW
from xmodule.contentstore.django import contentstore from xmodule.contentstore.django import contentstore
from xmodule.error_module import ErrorDescriptor from xmodule.error_module import ErrorDescriptor
......
...@@ -57,7 +57,7 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey ...@@ -57,7 +57,7 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey
from xmodule.contentstore.django import contentstore from xmodule.contentstore.django import contentstore
from xmodule.modulestore.django import modulestore, ModuleI18nService from xmodule.modulestore.django import modulestore, ModuleI18nService
from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore.exceptions import ItemNotFoundError
from xmodule_modifiers import ( from openedx.core.lib.xblock_utils import (
replace_course_urls, replace_course_urls,
replace_jump_to_id_urls, replace_jump_to_id_urls,
replace_static_urls, replace_static_urls,
......
...@@ -1000,7 +1000,7 @@ class TestStaffDebugInfo(ModuleStoreTestCase): ...@@ -1000,7 +1000,7 @@ class TestStaffDebugInfo(ModuleStoreTestCase):
self.user, self.user,
self.descriptor 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 = [] mock_grade_histogram.return_value = []
module = render.get_module( module = render.get_module(
self.user, self.user,
...@@ -1022,7 +1022,7 @@ class TestStaffDebugInfo(ModuleStoreTestCase): ...@@ -1022,7 +1022,7 @@ class TestStaffDebugInfo(ModuleStoreTestCase):
max_grade=1, max_grade=1,
state="{}", 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 = [] mock_grade_histogram.return_value = []
module = render.get_module( module = render.get_module(
self.user, self.user,
......
...@@ -23,7 +23,7 @@ from util.json_request import JsonResponse ...@@ -23,7 +23,7 @@ from util.json_request import JsonResponse
from mock import patch from mock import patch
from lms.djangoapps.lms_xblock.runtime import quote_slashes 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.html_module import HtmlDescriptor
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from xblock.field_data import DictFieldData from xblock.field_data import DictFieldData
......
...@@ -7,7 +7,7 @@ from rest_framework.response import Response ...@@ -7,7 +7,7 @@ from rest_framework.response import Response
from courseware.courses import get_course_about_section, get_course_info_section_module 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 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 from ..utils import mobile_view, mobile_course_access
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment