From d6202880ae43845d1ce6f6027f7e10a5f48a034a Mon Sep 17 00:00:00 2001
From: Awais Qureshi <awais.qureshi@arbisoft.com>
Date: Tue, 3 Aug 2021 15:42:14 +0500
Subject: [PATCH] chore: Removed python_2_unicode_compatible decorator.
 (#28342)

* chore: Removed python_2_unicode_compatible decorator.
---
 common/lib/capa/capa/capa_problem.py              | 3 +--
 common/lib/capa/capa/inputtypes.py                | 3 +--
 common/lib/capa/capa/responsetypes.py             | 3 +--
 common/lib/xmodule/xmodule/library_root_xblock.py | 2 --
 common/lib/xmodule/xmodule/modulestore/xml.py     | 2 --
 common/lib/xmodule/xmodule/tests/__init__.py      | 3 +--
 common/lib/xmodule/xmodule/x_module.py            | 3 +--
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index ee2c9967c6..37250d4d06 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -23,7 +23,7 @@ from datetime import datetime
 from xml.sax.saxutils import unescape
 
 import six
-from django.utils.encoding import python_2_unicode_compatible
+
 from lxml import etree
 from pytz import UTC
 
@@ -128,7 +128,6 @@ class LoncapaSystem(object):
         self.matlab_api_key = matlab_api_key
 
 
-@python_2_unicode_compatible
 class LoncapaProblem(object):
     """
     Main class for capa Problems.
diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index ebebc59d98..f4a2cfe749 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -53,7 +53,7 @@ import pyparsing
 import six
 from calc.preview import latex_preview
 from chem import chemcalc
-from django.utils.encoding import python_2_unicode_compatible
+
 from lxml import etree
 from six import text_type
 
@@ -73,7 +73,6 @@ log = logging.getLogger(__name__)
 registry = TagRegistry()  # pylint: disable=invalid-name
 
 
-@python_2_unicode_compatible
 class Status(object):
     """
     Problem status
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 107311800d..8eb2eca87c 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -34,7 +34,7 @@ import six
 # specific library imports
 from calc import UndefinedVariable, UnmatchedParenthesis, evaluator
 from django.utils import html
-from django.utils.encoding import python_2_unicode_compatible
+
 from lxml import etree
 from lxml.html.soupparser import fromstring as fromstring_bs  # uses Beautiful Soup!!! FIXME?
 from pyparsing import ParseException
@@ -110,7 +110,6 @@ class StudentInputError(Exception):
 # Main base class for CAPA responsetypes
 
 
-@python_2_unicode_compatible
 class LoncapaResponse(six.with_metaclass(abc.ABCMeta, object)):
     """
     Base class for CAPA responsetypes.  Each response type (ie a capa question,
diff --git a/common/lib/xmodule/xmodule/library_root_xblock.py b/common/lib/xmodule/xmodule/library_root_xblock.py
index 5d296e66b9..ed2fc452a3 100644
--- a/common/lib/xmodule/xmodule/library_root_xblock.py
+++ b/common/lib/xmodule/xmodule/library_root_xblock.py
@@ -5,7 +5,6 @@
 
 import logging
 
-from django.utils.encoding import python_2_unicode_compatible
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.fields import Boolean, List, Scope, String
@@ -18,7 +17,6 @@ log = logging.getLogger(__name__)
 _ = lambda text: text
 
 
-@python_2_unicode_compatible
 class LibraryRoot(XBlock):
     """
     The LibraryRoot is the root XBlock of a content library. All other blocks in
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index d217773a1a..d87bee1932 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -12,7 +12,6 @@ from collections import defaultdict
 from contextlib import contextmanager
 from importlib import import_module
 
-from django.utils.encoding import python_2_unicode_compatible
 from fs.osfs import OSFS
 from lazy import lazy
 from lxml import etree
@@ -300,7 +299,6 @@ class CourseImportLocationManager(CourseLocationManager):
         self.target_course_id = target_course_id
 
 
-@python_2_unicode_compatible
 class XMLModuleStore(ModuleStoreReadBase):
     """
     An XML backed ModuleStore
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index 284d2b8075..2ebc9787a6 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -20,7 +20,7 @@ from functools import wraps
 from unittest.mock import Mock
 
 from django.test import TestCase
-from django.utils.encoding import python_2_unicode_compatible
+
 from opaque_keys.edx.keys import CourseKey
 from path import Path as path
 from xblock.core import XBlock
@@ -204,7 +204,6 @@ def map_references(value, field, actual_course_key):
     return value
 
 
-@python_2_unicode_compatible
 class LazyFormat:
     """
     An stringy object that delays formatting until it's put into a string context.
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index b814a3a695..9b8f898d1a 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -8,7 +8,7 @@ from collections import namedtuple
 from functools import partial
 
 import yaml
-from django.utils.encoding import python_2_unicode_compatible
+
 from lazy import lazy
 from lxml import etree
 from opaque_keys.edx.asides import AsideDefinitionKeyV2, AsideUsageKeyV2
@@ -917,7 +917,6 @@ class XModuleToXBlockMixin:
 
 
 @XBlock.needs("i18n")
-@python_2_unicode_compatible
 class XModule(XModuleToXBlockMixin, HTMLSnippet, XModuleMixin):  # lint-amnesty, pylint: disable=abstract-method
     """ Implements a generic learning module.