diff --git a/openedx/core/djangoapps/olx_rest_api/adapters.py b/openedx/core/djangoapps/olx_rest_api/adapters.py index 4db3cb03aa..43aedda7d4 100644 --- a/openedx/core/djangoapps/olx_rest_api/adapters.py +++ b/openedx/core/djangoapps/olx_rest_api/adapters.py @@ -14,7 +14,7 @@ from xmodule.contentstore.content import StaticContent from xmodule.exceptions import NotFoundError from xmodule.modulestore.django import modulestore as store from xmodule.modulestore.exceptions import ItemNotFoundError -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from common.djangoapps.static_replace import replace_static_urls diff --git a/openedx/core/djangoapps/xblock/runtime/serializer.py b/openedx/core/djangoapps/xblock/runtime/serializer.py index 3cf803b4db..f1c188afb8 100644 --- a/openedx/core/djangoapps/xblock/runtime/serializer.py +++ b/openedx/core/djangoapps/xblock/runtime/serializer.py @@ -12,7 +12,7 @@ from fs.wrapfs import WrapFS from lxml.etree import Element from lxml.etree import tostring as etree_tostring -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin log = logging.getLogger(__name__) diff --git a/xmodule/annotatable_block.py b/xmodule/annotatable_block.py index 1711664836..774ad90097 100644 --- a/xmodule/annotatable_block.py +++ b/xmodule/annotatable_block.py @@ -13,7 +13,7 @@ from openedx.core.djangolib.markup import HTML, Text from xmodule.editing_block import EditingMixin from xmodule.raw_block import RawMixin from xmodule.util.xmodule_django import add_webpack_to_fragment -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py index c8b928cb01..4cf6f80e53 100644 --- a/xmodule/capa_block.py +++ b/xmodule/capa_block.py @@ -45,7 +45,7 @@ from xmodule.x_module import ( XModuleToXBlockMixin, shim_xmodule_js ) -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from common.djangoapps.xblock_django.constants import ( ATTR_KEY_ANONYMOUS_USER_ID, ATTR_KEY_USER_IS_STAFF, diff --git a/xmodule/conditional_block.py b/xmodule/conditional_block.py index 3422a892ce..db6dd2100f 100644 --- a/xmodule/conditional_block.py +++ b/xmodule/conditional_block.py @@ -21,7 +21,7 @@ from xmodule.seq_block import SequenceMixin from xmodule.studio_editable import StudioEditableBlock from xmodule.util.xmodule_django import add_webpack_to_fragment from xmodule.validation import StudioValidation, StudioValidationMessage -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, diff --git a/xmodule/discussion_block.py b/xmodule/discussion_block.py index 63106fa9f2..84d5fdfb4a 100644 --- a/xmodule/discussion_block.py +++ b/xmodule/discussion_block.py @@ -18,7 +18,7 @@ from xblockutils.studio_editable import StudioEditableXBlockMixin from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, Provider from openedx.core.djangolib.markup import HTML, Text from openedx.core.lib.xblock_utils import get_css_dependencies, get_js_dependencies -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin log = logging.getLogger(__name__) loader = ResourceLoader(__name__) # pylint: disable=invalid-name diff --git a/xmodule/hidden_block.py b/xmodule/hidden_block.py index 4aa2987c25..0ed8a10ec7 100644 --- a/xmodule/hidden_block.py +++ b/xmodule/hidden_block.py @@ -5,7 +5,7 @@ The Hidden XBlock. from web_fragments.fragment import Fragment from xblock.core import XBlock from xmodule.raw_block import RawMixin -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( XModuleMixin, XModuleToXBlockMixin, diff --git a/xmodule/html_block.py b/xmodule/html_block.py index 5913312a44..2c3e24d37e 100644 --- a/xmodule/html_block.py +++ b/xmodule/html_block.py @@ -32,7 +32,7 @@ from xmodule.x_module import ( XModuleMixin, XModuleToXBlockMixin, ) -from xmodule.xml_module import XmlMixin, name_to_pathname +from xmodule.xml_block import XmlMixin, name_to_pathname log = logging.getLogger("edx.courseware") diff --git a/xmodule/library_content_block.py b/xmodule/library_content_block.py index a32a362664..94bf54fec0 100644 --- a/xmodule/library_content_block.py +++ b/xmodule/library_content_block.py @@ -29,7 +29,7 @@ from xmodule.mako_block import MakoTemplateBlockBase from xmodule.studio_editable import StudioEditableBlock from xmodule.util.xmodule_django import add_webpack_to_fragment from xmodule.validation import StudioValidation, StudioValidationMessage -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, diff --git a/xmodule/lti_block.py b/xmodule/lti_block.py index 5cb3e00fd6..795db6c64e 100644 --- a/xmodule/lti_block.py +++ b/xmodule/lti_block.py @@ -86,7 +86,7 @@ from common.djangoapps.xblock_django.constants import ( from xmodule.lti_2_util import LTI20BlockMixin, LTIError from xmodule.raw_block import EmptyDataRawMixin from xmodule.util.xmodule_django import add_webpack_to_fragment -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, diff --git a/xmodule/poll_block.py b/xmodule/poll_block.py index 575a6574bf..b29ed710e9 100644 --- a/xmodule/poll_block.py +++ b/xmodule/poll_block.py @@ -30,7 +30,7 @@ from xmodule.x_module import ( XModuleMixin, XModuleToXBlockMixin, ) -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin log = logging.getLogger(__name__) diff --git a/xmodule/randomize_block.py b/xmodule/randomize_block.py index 15b6bc0f36..a9c6a706df 100644 --- a/xmodule/randomize_block.py +++ b/xmodule/randomize_block.py @@ -9,7 +9,7 @@ from web_fragments.fragment import Fragment from xblock.fields import Integer, Scope from xmodule.mako_block import MakoTemplateBlockBase from xmodule.seq_block import SequenceMixin -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, diff --git a/xmodule/seq_block.py b/xmodule/seq_block.py index bd5cba7a01..fae726d1e3 100644 --- a/xmodule/seq_block.py +++ b/xmodule/seq_block.py @@ -40,7 +40,7 @@ from .fields import Date from .mako_block import MakoTemplateBlockBase from .progress import Progress from .x_module import AUTHOR_VIEW, PUBLIC_VIEW, STUDENT_VIEW -from .xml_module import XmlMixin +from .xml_block import XmlMixin log = logging.getLogger(__name__) diff --git a/xmodule/split_test_module.py b/xmodule/split_test_module.py index 51ce967a15..63f728352c 100644 --- a/xmodule/split_test_module.py +++ b/xmodule/split_test_module.py @@ -24,7 +24,7 @@ from xmodule.seq_block import ProctoringFields, SequenceMixin from xmodule.studio_editable import StudioEditableBlock from xmodule.util.xmodule_django import add_webpack_to_fragment from xmodule.validation import StudioValidation, StudioValidationMessage -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, diff --git a/xmodule/template_block.py b/xmodule/template_block.py index e83a2a34df..2d2d6a5313 100644 --- a/xmodule/template_block.py +++ b/xmodule/template_block.py @@ -18,7 +18,7 @@ from xmodule.x_module import ( XModuleMixin, XModuleToXBlockMixin, ) -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from openedx.core.djangolib.markup import Text diff --git a/xmodule/tests/test_import.py b/xmodule/tests/test_import.py index ca151c3488..543f8c62f0 100644 --- a/xmodule/tests/test_import.py +++ b/xmodule/tests/test_import.py @@ -22,7 +22,7 @@ from xmodule.modulestore.inheritance import InheritanceMixin, compute_inherited_ from xmodule.modulestore.xml import ImportSystem, LibraryXMLModuleStore, XMLModuleStore from xmodule.tests import DATA_DIR from xmodule.x_module import XModuleMixin -from xmodule.xml_module import is_pointer_tag +from xmodule.xml_block import is_pointer_tag ORG = 'test_org' COURSE = 'test_course' diff --git a/xmodule/tests/test_xml_module.py b/xmodule/tests/test_xml_block.py similarity index 99% rename from xmodule/tests/test_xml_module.py rename to xmodule/tests/test_xml_block.py index b15dc3529f..24ab557df3 100644 --- a/xmodule/tests/test_xml_module.py +++ b/xmodule/tests/test_xml_block.py @@ -20,7 +20,7 @@ from xmodule.tests import get_test_descriptor_system from xmodule.tests.xml import XModuleXmlImportTest from xmodule.tests.xml.factories import CourseFactory, ProblemFactory, SequenceFactory from xmodule.x_module import XModuleMixin -from xmodule.xml_module import XmlMixin, deserialize_field, serialize_field +from xmodule.xml_block import XmlMixin, deserialize_field, serialize_field class CrazyJsonString(String): diff --git a/xmodule/vertical_block.py b/xmodule/vertical_block.py index e7c8682188..b800d549f6 100644 --- a/xmodule/vertical_block.py +++ b/xmodule/vertical_block.py @@ -21,7 +21,7 @@ from xmodule.studio_editable import StudioEditableBlock from xmodule.util.misc import is_xblock_an_assignment from xmodule.util.xmodule_django import add_webpack_to_fragment from xmodule.x_module import PUBLIC_VIEW, STUDENT_VIEW, XModuleFields -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin log = logging.getLogger(__name__) diff --git a/xmodule/video_module/video_module.py b/xmodule/video_module/video_module.py index e9f191ad62..f189d088f7 100644 --- a/xmodule/video_module/video_module.py +++ b/xmodule/video_module/video_module.py @@ -48,7 +48,7 @@ from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, shim_xmodule_js, XModuleMixin, XModuleToXBlockMixin, ) -from xmodule.xml_module import XmlMixin, deserialize_field, is_pointer_tag, name_to_pathname +from xmodule.xml_block import XmlMixin, deserialize_field, is_pointer_tag, name_to_pathname from .bumper_utils import bumperize from .transcripts_utils import ( diff --git a/xmodule/word_cloud_block.py b/xmodule/word_cloud_block.py index cf458a1c7a..5ce62e96eb 100644 --- a/xmodule/word_cloud_block.py +++ b/xmodule/word_cloud_block.py @@ -18,7 +18,7 @@ from xblock.fields import Boolean, Dict, Integer, List, Scope, String from xmodule.editing_block import EditingMixin from xmodule.raw_block import EmptyDataRawMixin from xmodule.util.xmodule_django import add_webpack_to_fragment -from xmodule.xml_module import XmlMixin +from xmodule.xml_block import XmlMixin from xmodule.x_module import ( HTMLSnippet, ResourceTemplates, diff --git a/xmodule/xml_module.py b/xmodule/xml_block.py similarity index 100% rename from xmodule/xml_module.py rename to xmodule/xml_block.py