refactor: rename module -> block within lms/djangoapps/courseware

Also, removed unused `_has_access_xmodule` methid from `lms/djangoapps/courseware/access.py`.

openedx/core/djangoapps/courseware_api/views.py

@@ -40,7 +40,7 @@ from lms.djangoapps.courseware.masquerade import (
     is_masquerading_as_non_audit_enrollment,
 )
 from lms.djangoapps.courseware.models import LastSeenCoursewareTimezone
-from lms.djangoapps.courseware.module_render import get_module_by_usage_id
+from lms.djangoapps.courseware.block_render import get_block_by_usage_id
 from lms.djangoapps.courseware.toggles import course_exit_page_is_active
 from lms.djangoapps.courseware.views.views import get_cert_data
 from lms.djangoapps.gating.api import get_entrance_exam_score, get_entrance_exam_usage_key
@@ -584,7 +584,7 @@ class SequenceMetadata(DeveloperErrorViewMixin, APIView):
             reset_masquerade_data=True,
         )
 
-        sequence, _ = get_module_by_usage_id(
+        sequence, _ = get_block_by_usage_id(
             self.request,
             str(usage_key.course_key),
             str(usage_key),

openedx/core/djangoapps/schedules/content_highlights.py

@@ -131,7 +131,7 @@ def _get_course_block(course_descriptor, user):
     # Adding courseware imports here to insulate other apps (e.g. schedules) to
     # avoid import errors.
     from lms.djangoapps.courseware.model_data import FieldDataCache
-    from lms.djangoapps.courseware.module_render import get_module_for_descriptor
+    from lms.djangoapps.courseware.block_render import get_block_for_descriptor
 
     # Fake a request to fool parts of the courseware that want to inspect it.
     request = get_request_or_stub()
@@ -142,7 +142,7 @@ def _get_course_block(course_descriptor, user):
     field_data_cache = FieldDataCache.cache_for_descriptor_descendents(
         course_descriptor.id, user, course_descriptor, depth=1, read_only=True,
     )
-    course_block = get_module_for_descriptor(
+    course_block = get_block_for_descriptor(
         user, request, course_descriptor, field_data_cache, course_descriptor.id, course=course_descriptor,
     )
     if not course_block:

openedx/core/djangoapps/schedules/tests/test_content_highlights.py

@@ -161,9 +161,9 @@ class TestContentHighlights(ModuleStoreTestCase):  # lint-amnesty, pylint: disab
         with pytest.raises(CourseUpdateDoesNotExist):
             get_next_section_highlights(self.user, self.course_key, two_days_ago, six_days.date())
 
-    @patch('lms.djangoapps.courseware.module_render.get_module_for_descriptor')
-    def test_get_highlights_without_module(self, mock_get_module):
-        mock_get_module.return_value = None
+    @patch('lms.djangoapps.courseware.block_render.get_block_for_descriptor')
+    def test_get_highlights_without_block(self, mock_get_block):
+        mock_get_block.return_value = None
 
         with self.store.bulk_operations(self.course_key):
             self._create_chapter(highlights=['Test highlight'])

openedx/core/djangoapps/xblock/runtime/runtime.py

@@ -31,7 +31,7 @@ from common.djangoapps.track import contexts as track_contexts
 from common.djangoapps.track import views as track_views
 from common.djangoapps.xblock_django.user_service import DjangoXBlockUserService
 from lms.djangoapps.courseware.model_data import DjangoKeyValueStore, FieldDataCache
-from lms.djangoapps.courseware import module_render
+from lms.djangoapps.courseware import block_render
 from lms.djangoapps.grades.api import signals as grades_signals
 from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
 from openedx.core.djangoapps.xblock.runtime.blockstore_field_data import BlockstoreChildrenData, BlockstoreFieldData
@@ -258,11 +258,11 @@ class XBlockRuntime(RuntimeShim, Runtime):
         elif service_name == 'rebind_user':
             # this service should ideally be initialized with all the arguments of get_module_system_for_user
             # but only the positional arguments are passed here as the other arguments are too
-            # specific to the lms.module_render module
+            # specific to the lms.block_render module
             return RebindUserService(
                 self.user,
                 context_key,
-                module_render.get_module_system_for_user,
+                block_render.get_module_system_for_user,
                 track_function=make_track_function(),
                 request_token=request_token(crum.get_current_request()),
             )

openedx/features/content_type_gating/tests/test_access.py

@@ -27,7 +27,7 @@ from common.djangoapps.student.tests.factories import InstructorFactory
 from common.djangoapps.student.tests.factories import OrgInstructorFactory
 from common.djangoapps.student.tests.factories import OrgStaffFactory
 from common.djangoapps.student.tests.factories import StaffFactory
-from lms.djangoapps.courseware.module_render import load_single_xblock
+from lms.djangoapps.courseware.block_render import load_single_xblock
 from lms.djangoapps.courseware.tests.helpers import MasqueradeMixin
 from lms.djangoapps.discussion.django_comment_client.tests.factories import RoleFactory
 from openedx.core.djangoapps.django_comment_common.models import (

openedx/features/course_experience/course_updates.py

@@ -5,7 +5,7 @@ Utilities for course updates.
 import hashlib
 from datetime import datetime
 
-from lms.djangoapps.courseware.courses import get_course_info_section_module
+from lms.djangoapps.courseware.courses import get_course_info_section_block
 from openedx.core.djangoapps.user_api.course_tag.api import get_course_tag, set_course_tag
 
 STATUS_VISIBLE = 'visible'
@@ -59,7 +59,7 @@ def get_ordered_updates(request, course):
     """
     Returns all public course updates in reverse chronological order, including dismissed ones.
     """
-    info_module = get_course_info_section_module(request, request.user, course, 'updates')
+    info_module = get_course_info_section_block(request, request.user, course, 'updates')
     if not info_module:
         return []
 

openedx/features/course_experience/views/course_updates.py

@@ -10,7 +10,7 @@ from django.views.decorators.cache import cache_control
 from opaque_keys.edx.keys import CourseKey
 from web_fragments.fragment import Fragment
 
-from lms.djangoapps.courseware.courses import get_course_info_section_module, get_course_with_access
+from lms.djangoapps.courseware.courses import get_course_info_section_block, get_course_with_access
 from lms.djangoapps.courseware.views.views import CourseTabView
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 from openedx.features.course_experience import default_course_url
@@ -76,7 +76,7 @@ class CourseUpdatesFragmentView(EdxFragmentView):
         for older implementations and a few tests that store
         a single html object representing all the updates.
         """
-        info_module = get_course_info_section_module(request, request.user, course, 'updates')
+        info_module = get_course_info_section_block(request, request.user, course, 'updates')
         info_block = getattr(info_module, '_xmodule', info_module)
         return info_block.system.service(
             info_block, "replace_urls"

openedx/features/personalized_learner_schedules/show_answer/tests/test_show_answer_override.py

@@ -8,7 +8,7 @@ from edx_toggles.toggles.testutils import override_waffle_flag
 
 from lms.djangoapps.ccx.tests.test_overrides import inject_field_overrides
 from lms.djangoapps.courseware.model_data import FieldDataCache
-from lms.djangoapps.courseware.module_render import get_module
+from lms.djangoapps.courseware.block_render import get_block
 from openedx.features.course_experience import RELATIVE_DATES_FLAG
 from xmodule.capa_block import SHOWANSWER  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
@@ -33,7 +33,7 @@ class ShowAnswerFieldOverrideTest(ModuleStoreTestCase):
     def get_course_block(self, course):
         request = RequestFactory().request()
         field_data_cache = FieldDataCache([], course.id, self.user)
-        return get_module(self.user, request, course.location, field_data_cache, course=course)
+        return get_block(self.user, request, course.location, field_data_cache, course=course)
 
     @ddt.data(True, False)
     def test_override_enabled_for(self, active):

openedx/tests/completion_integration/test_services.py

@@ -125,15 +125,15 @@ class CompletionServiceTestCase(CompletionWaffleTestMixin, SharedModuleStoreTest
         module_system.descriptor_runtime = module.runtime._descriptor_system  # pylint: disable=protected-access
         module_system._services['library_tools'] = LibraryToolsService(self.store, self.user.id)  # pylint: disable=protected-access
 
-        def get_module(descriptor):
-            """Mocks module_system get_module function"""
+        def get_block(descriptor):
+            """Mocks module_system get_block_for_descriptor function"""
             sub_module_system = get_test_system(course_id=module.location.course_key)
-            sub_module_system.get_module = get_module
+            sub_module_system.get_block_for_descriptor = get_block
             sub_module_system.descriptor_runtime = descriptor._runtime  # pylint: disable=protected-access
             descriptor.bind_for_student(sub_module_system, self.user.id)
             return descriptor
 
-        module_system.get_module = get_module
+        module_system.get_block_for_descriptor = get_block
         module.xmodule_runtime = module_system
 
     def test_completion_service(self):