From 23d1e5b65433a57e38e72edc1ca3d3db165ee4b4 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 11 Mar 2021 21:19:31 +0500
Subject: [PATCH] Remove unused RawDescriptor and EmptyDataRawDescriptor.

---
 common/lib/xmodule/setup.py                      |  1 -
 common/lib/xmodule/xmodule/raw_module.py         | 16 ----------------
 .../xblock_discussion/__init__.py                |  3 +--
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index a1e49da353..b314a10e17 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -4,7 +4,6 @@ from setuptools import find_packages, setup
 
 XMODULES = [
     "section = xmodule.backcompat_module:SemanticSectionDescriptor",
-    "raw = xmodule.raw_module:RawDescriptor",
 ]
 XBLOCKS = [
     "about = xmodule.html_module:AboutBlock",
diff --git a/common/lib/xmodule/xmodule/raw_module.py b/common/lib/xmodule/xmodule/raw_module.py
index a07f51e658..c840ab2f56 100644
--- a/common/lib/xmodule/xmodule/raw_module.py
+++ b/common/lib/xmodule/xmodule/raw_module.py
@@ -99,14 +99,6 @@ class RawMixin:
         return block
 
 
-class RawDescriptor(RawMixin, XmlDescriptor, XMLEditingDescriptor):
-    """
-    Module that provides a raw editing view of its data and children.  It
-    requires that the definition xml is valid.
-    """
-    pass  # lint-amnesty, pylint: disable=unnecessary-pass
-
-
 class EmptyDataRawMixin:
     """
     Common code between EmptyDataRawDescriptor and XBlocks converted from XModules.
@@ -125,11 +117,3 @@ class EmptyDataRawMixin:
         if self.data:
             return etree.fromstring(self.data)
         return etree.Element(self.category)
-
-
-class EmptyDataRawDescriptor(EmptyDataRawMixin, XmlDescriptor, XMLEditingDescriptor):
-    """
-    Version of RawDescriptor for modules which may have no XML data,
-    but use XMLEditingDescriptor for import/export handling.
-    """
-    pass  # lint-amnesty, pylint: disable=unnecessary-pass
diff --git a/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion/__init__.py b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion/__init__.py
index 573f722275..893fc6bf7c 100644
--- a/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion/__init__.py
+++ b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion/__init__.py
@@ -19,7 +19,6 @@ from xblockutils.studio_editable import StudioEditableXBlockMixin
 
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.core.lib.xblock_builtin import get_css_dependencies, get_js_dependencies
-from xmodule.raw_module import RawDescriptor
 from xmodule.xml_module import XmlParserMixin
 
 
@@ -74,7 +73,7 @@ class DiscussionXBlock(XBlock, StudioEditableXBlockMixin, XmlParserMixin):  # li
     has_author_view = True  # Tells Studio to use author_view
 
     # support for legacy OLX format - consumed by XmlParserMixin.load_metadata
-    metadata_translations = dict(RawDescriptor.metadata_translations)
+    metadata_translations = dict(XmlParserMixin.metadata_translations)
     metadata_translations['id'] = 'discussion_id'
     metadata_translations['for'] = 'discussion_target'