From e3591701e3a7d62ec08a857943687589873cd32a Mon Sep 17 00:00:00 2001 From: 0x29a Date: Wed, 26 Oct 2022 21:05:32 +0200 Subject: [PATCH] refactor: xmodule/library_content_module.py -> xmodule/library_content_block.py --- lms/djangoapps/course_blocks/transformers/library_content.py | 2 +- setup.py | 2 +- .../{library_content_module.py => library_content_block.py} | 4 ++-- xmodule/library_tools.py | 2 +- xmodule/modulestore/split_mongo/split.py | 2 +- xmodule/static_content.py | 2 +- xmodule/tests/test_library_content.py | 2 +- xmodule/tests/test_randomize_module.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename xmodule/{library_content_module.py => library_content_block.py} (99%) diff --git a/lms/djangoapps/course_blocks/transformers/library_content.py b/lms/djangoapps/course_blocks/transformers/library_content.py index 7a9dbddc46..ae4ad7b228 100644 --- a/lms/djangoapps/course_blocks/transformers/library_content.py +++ b/lms/djangoapps/course_blocks/transformers/library_content.py @@ -14,7 +14,7 @@ from openedx.core.djangoapps.content.block_structure.transformer import ( BlockStructureTransformer, FilteringTransformerMixin ) -from xmodule.library_content_module import LibraryContentBlock # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.library_content_block import LibraryContentBlock # lint-amnesty, pylint: disable=wrong-import-order from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order from ..utils import get_student_module_as_dict diff --git a/setup.py b/setup.py index 6bc1594ace..168cac610c 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ XBLOCKS = [ "html = xmodule.html_block:HtmlBlock", "image = xmodule.template_module:TranslateCustomTagBlock", "library = xmodule.library_root_xblock:LibraryRoot", - "library_content = xmodule.library_content_module:LibraryContentBlock", + "library_content = xmodule.library_content_block:LibraryContentBlock", "library_sourced = xmodule.library_sourced_block:LibrarySourcedBlock", "lti = xmodule.lti_module:LTIBlock", "poll_question = xmodule.poll_module:PollBlock", diff --git a/xmodule/library_content_module.py b/xmodule/library_content_block.py similarity index 99% rename from xmodule/library_content_module.py rename to xmodule/library_content_block.py index 0d9d4e080f..81b961c688 100644 --- a/xmodule/library_content_module.py +++ b/xmodule/library_content_block.py @@ -591,7 +591,7 @@ class LibraryContentBlock( def validate(self): """ - Validates the state of this Library Content Module Instance. This + Validates the state of this Library Content Block Instance. This is the override of the general XBlock method, and it will also ask its superclass to validate. """ @@ -733,7 +733,7 @@ class LibraryContentBlock( return definition, children def definition_to_xml(self, resource_fs): - """ Exports Library Content Module to XML """ + """ Exports Library Content Block to XML """ xml_object = etree.Element('library_content') for child in self.get_children(): self.runtime.add_block_as_child_node(child, xml_object) diff --git a/xmodule/library_tools.py b/xmodule/library_tools.py index c0bfd48d4b..5b59cc210d 100644 --- a/xmodule/library_tools.py +++ b/xmodule/library_tools.py @@ -15,7 +15,7 @@ from openedx.core.djangoapps.xblock.api import load_block from openedx.core.lib import blockstore_api from common.djangoapps.student.auth import has_studio_write_access from xmodule.capa_block import ProblemBlock -from xmodule.library_content_module import ANY_CAPA_TYPE_VALUE +from xmodule.library_content_block import ANY_CAPA_TYPE_VALUE from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.exceptions import ItemNotFoundError diff --git a/xmodule/modulestore/split_mongo/split.py b/xmodule/modulestore/split_mongo/split.py index 14557a9d85..58e6af9816 100644 --- a/xmodule/modulestore/split_mongo/split.py +++ b/xmodule/modulestore/split_mongo/split.py @@ -82,7 +82,7 @@ from xmodule.assetstore import AssetMetadata from xmodule.course_block import CourseSummary from xmodule.error_block import ErrorBlock from xmodule.errortracker import null_error_tracker -from xmodule.library_content_module import LibrarySummary +from xmodule.library_content_block import LibrarySummary from xmodule.modulestore import ( BlockData, BulkOperationsMixin, diff --git a/xmodule/static_content.py b/xmodule/static_content.py index 0fd00dfe1a..708898f4bd 100755 --- a/xmodule/static_content.py +++ b/xmodule/static_content.py @@ -23,7 +23,7 @@ from xmodule.annotatable_block import AnnotatableBlock from xmodule.capa_block import ProblemBlock from xmodule.conditional_block import ConditionalBlock from xmodule.html_block import AboutBlock, CourseInfoBlock, HtmlBlock, StaticTabBlock -from xmodule.library_content_module import LibraryContentBlock +from xmodule.library_content_block import LibraryContentBlock from xmodule.lti_module import LTIBlock from xmodule.poll_module import PollBlock from xmodule.seq_module import SequenceBlock diff --git a/xmodule/tests/test_library_content.py b/xmodule/tests/test_library_content.py index 2a7d3954a9..e3c4347e49 100644 --- a/xmodule/tests/test_library_content.py +++ b/xmodule/tests/test_library_content.py @@ -14,7 +14,7 @@ from web_fragments.fragment import Fragment from xblock.runtime import Runtime as VanillaRuntime from rest_framework import status -from xmodule.library_content_module import ANY_CAPA_TYPE_VALUE, LibraryContentBlock +from xmodule.library_content_block import ANY_CAPA_TYPE_VALUE, LibraryContentBlock from xmodule.library_tools import LibraryToolsService from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.tests.factories import CourseFactory, LibraryFactory diff --git a/xmodule/tests/test_randomize_module.py b/xmodule/tests/test_randomize_module.py index e86209b8db..15983a889e 100644 --- a/xmodule/tests/test_randomize_module.py +++ b/xmodule/tests/test_randomize_module.py @@ -16,7 +16,7 @@ from .test_course_module import DummySystem as TestImportSystem class RandomizeBlockTest(MixedSplitTestCase): """ - Base class for tests of LibraryContentModule (library_content_module.py) + Base class for tests of LibraryContentBlock (library_content_block.py) """ maxDiff = None