feat: remove built-in Discussion XBlock implementation (slash-n-burn #37819)

lms/djangoapps/courseware/management/commands/dump_course_structure.py

@@ -24,8 +24,8 @@
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from xblock.fields import Scope
+from xblocks_contrib.discussion import DiscussionXBlock
 
-from xmodule.discussion_block import DiscussionXBlock
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.inheritance import compute_inherited_metadata, own_metadata
 

lms/djangoapps/courseware/tests/test_discussion_xblock.py

@@ -19,14 +19,14 @@
 from opaque_keys.edx.keys import CourseKey
 from web_fragments.fragment import Fragment
 from xblock.field_data import DictFieldData
+from xblocks_contrib.discussion import DiscussionXBlock
 
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from lms.djangoapps.course_api.blocks.tests.helpers import deserialize_usage_key
 from lms.djangoapps.courseware.block_render import get_block_for_descriptor
 from lms.djangoapps.courseware.tests.helpers import XModuleRenderingTestBase
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, Provider
 from openedx.core.djangoapps.discussions.services import DiscussionConfigService
-from xmodule.discussion_block import DiscussionXBlock
 from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import BlockFactory, ToyCourseFactory
 from xmodule.tests.helpers import mock_render_template

openedx/core/djangoapps/discussions/utils.py

@@ -5,6 +5,7 @@
 from typing import Dict, List, Optional, Tuple  # noqa: UP035
 
 from opaque_keys.edx.keys import CourseKey
+from xblocks_contrib.discussion import DiscussionXBlock  # pylint: disable=wrong-import-order
 
 from lms.djangoapps.courseware.access import has_access
 from openedx.core.djangoapps.course_groups.cohorts import get_cohort_names, is_course_cohorted
@@ -13,7 +14,6 @@
 from openedx.core.lib.courses import get_course_by_id
 from openedx.core.types import User
 from xmodule.course_block import CourseBlock  # pylint: disable=wrong-import-order
-from xmodule.discussion_block import DiscussionXBlock
 from xmodule.modulestore.django import modulestore  # pylint: disable=wrong-import-order
 from xmodule.partitions.partitions import (  # pylint: disable=wrong-import-order
     ENROLLMENT_TRACK_PARTITION_ID,

openedx/envs/common.py

@@ -2104,15 +2104,6 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_HTML_BLOCK = True
 
-# .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
-# .. toggle_default: False
-# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted Discussion XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
-# .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
-# .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2026-04-10
-USE_EXTRACTED_DISCUSSION_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_PROBLEM_BLOCK
 # .. toggle_default: False

pyproject.toml

@@ -22,10 +22,10 @@ chapter = "xmodule.seq_block:SectionBlock"
 conditional = "xmodule.conditional_block:ConditionalBlock"
 course = "xmodule.course_block:CourseBlock"
 course_info = "xmodule.html_block:CourseInfoBlock"
+discussion = "xblocks_contrib:DiscussionXBlock"
 customtag = "xmodule.template_block:CustomTagBlock"
 custom_tag_template = "xmodule.template_block:CustomTagTemplateBlock"
 discuss = "xmodule.template_block:TranslateCustomTagBlock"
-discussion = "xmodule.discussion_block:DiscussionXBlock"
 error = "xmodule.error_block:ErrorBlock"
 hidden = "xmodule.hidden_block:HiddenBlock"
 html = "xmodule.html_block:HtmlBlock"