chore: chore

xmodule/annotatable_block.py

@@ -11,6 +11,7 @@
 from openedx.core.djangolib.markup import HTML, Text
 from xmodule.editing_block import EditingMixin
 from xmodule.raw_block import RawMixin
+from xmodule.toggles import USE_EXTRACTED_ANNOTATABLE_BLOCK
 from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
 from xmodule.xml_block import XmlMixin
 from xmodule.x_module import (
@@ -28,7 +29,7 @@
 
 
 @XBlock.needs('mako')
-class AnnotatableBlock(
+class _BuiltInAnnotatableBlock(
     RawMixin,
     XmlMixin,
     EditingMixin,
@@ -40,6 +41,8 @@ class AnnotatableBlock(
     Annotatable XBlock.
     """
 
+    is_extracted = False
+
     data = String(
         help=_("XML data for the annotation"),
         scope=Scope.content,
@@ -197,3 +200,10 @@ def studio_view(self, _context):
         add_webpack_js_to_fragment(fragment, 'AnnotatableBlockEditor')
         shim_xmodule_js(fragment, self.studio_js_module_name)
         return fragment
+
+AnnotatableBlock = (
+    # TODO: Revert following
+    # _ExractedAnnotatableBlock if USE_EXTRACTED_ANNOTATABLE_BLOCK.is_enabled()
+    _BuiltInAnnotatableBlock if USE_EXTRACTED_ANNOTATABLE_BLOCK.is_enabled()
+    else _BuiltInAnnotatableBlock
+)

xmodule/word_cloud_block.py

@@ -6,9 +6,6 @@
 If student have answered - words he entered and cloud.
 """
 
-# TODO: Uncomment following once https://github.com/openedx/edx-platform/issues/34840 is done
-# from xblocks_contrib import WordCloudBlock as _ExtractedWordCloudBlock
-
 
 import json
 import logging
@@ -317,6 +314,7 @@ def index_dictionary(self):
 
 
 WordCloudBlock = (
+    # TODO: Revert following
     # _ExractedWordCloudBLock if USE_EXTRACTED_WORD_CLOUD_BLOCK.is_enabled()
     _BuiltInWordCloudBlock if USE_EXTRACTED_WORD_CLOUD_BLOCK.is_enabled()
     else _BuiltInWordCloudBlock