diff --git a/xblocks_contrib/problem/capa/apps.py b/xblocks_contrib/problem/capa/apps.py
index 11a253d6..e3373de2 100644
--- a/xblocks_contrib/problem/capa/apps.py
+++ b/xblocks_contrib/problem/capa/apps.py
@@ -10,7 +10,7 @@ class CapaAppConfig(AppConfig):
     Configuration for the CAPA problem XBlock Django application.
 
     Why are we registering this as a Django App?
-    -------------------------------------------
+    --------------------------------------------
     By default, Django's template engine (specifically the `app_directories` loader)
     only discovers `templates/` folders that belong to an app listed in `INSTALLED_APPS`.
 
@@ -28,10 +28,13 @@ class CapaAppConfig(AppConfig):
     without manual intervention.
 
     References:
+
     - Open edX Plugin App Framework:
       https://docs.openedx.org/projects/edx-django-utils/en/latest/plugins/how_tos/how_to_create_a_plugin_app.html
+
     - Django App Directories Loader:
       https://docs.djangoproject.com/en/stable/ref/templates/api/#django.template.loaders.app_directories.Loader
+
     """
 
     name = "xblocks_contrib.problem.capa"
diff --git a/xblocks_contrib/problem/capa/capa_problem.py b/xblocks_contrib/problem/capa/capa_problem.py
index 7f7c1216..1329a747 100644
--- a/xblocks_contrib/problem/capa/capa_problem.py
+++ b/xblocks_contrib/problem/capa/capa_problem.py
@@ -81,7 +81,7 @@
 # main class for this module
 
 
-class LoncapaSystem:  # pylint: disable=too-few-public-methods,too-many-instance-attributes
+class LoncapaSystem:
     """
     An encapsulation of resources needed from the outside.
 
@@ -127,7 +127,7 @@ def __init__(  # pylint: disable=too-many-positional-arguments,too-many-argument
         self.matlab_api_key = matlab_api_key
 
 
-class LoncapaProblem:  # pylint: disable=too-many-public-methods,too-many-instance-attributes
+class LoncapaProblem:
     """
     Main class for capa Problems.
     """
@@ -239,7 +239,7 @@ def __init__(  # pylint: disable=too-many-positional-arguments,too-many-argument
             # Run response late_transforms last (see MultipleChoiceResponse)
             # Sort the responses to be in *_1 *_2 ... order.
             responses = list(self.responders.values())
-            responses = sorted(responses, key=lambda resp: int(resp.id[resp.id.rindex("_") + 1 :]))
+            responses = sorted(responses, key=lambda resp: int(resp.id[resp.id.rindex("_") + 1:]))
             for response in responses:
                 if hasattr(response, "late_transforms"):
                     response.late_transforms(self)
@@ -251,21 +251,35 @@ def make_xml_compatible(self, tree):
         """
         Adjust tree xml in-place for compatibility before creating
         a problem from it.
+
         The idea here is to provide a central point for XML translation,
         for example, supporting an old XML format. At present, there just two translations.
 
         1. <additional_answer> compatibility translation:
-        old:    <additional_answer>ANSWER</additional_answer>
-        convert to
-        new:    <additional_answer answer="ANSWER">OPTIONAL-HINT</addional_answer>
+
+           old::
+
+               <additional_answer>ANSWER</additional_answer>
+
+           convert to
+
+           new::
+
+               <additional_answer answer="ANSWER">OPTIONAL-HINT</addional_answer>
 
         2. <optioninput> compatibility translation:
-        optioninput works like this internally:
-            <optioninput options="('yellow','blue','green')" correct="blue" />
-        With extended hints there is a new <option> tag, like this
-            <option correct="True">blue <optionhint>sky color</optionhint> </option>
-        This translation takes in the new format and synthesizes the old option= attribute
-        so all downstream logic works unchanged with the new <option> tag format.
+
+           optioninput works like this internally::
+
+               <optioninput options="('yellow','blue','green')" correct="blue" />
+
+           With extended hints there is a new <option> tag, like this::
+
+               <option correct="True">blue <optionhint>sky color</optionhint></option>
+
+           This translation takes in the new format and synthesizes the old
+           ``option=`` attribute so all downstream logic works unchanged with
+           the new <option> tag format.
         """
 
         def is_optioninput_valid(optioninput):
@@ -362,8 +376,12 @@ def get_max_score(self):
     def calculate_score(self, correct_map=None):
         """
         Compute score for this problem.  The score is the number of points awarded.
-        Returns a dictionary {'score': integer, from 0 to get_max_score(),
-                              'total': get_max_score()}.
+        Returns a dictionary::
+
+            {
+                'score': integer, from 0 to get_max_score(),
+                'total': get_max_score()
+            }
 
         Takes an optional correctness map for use in the rescore workflow.
         """
@@ -957,7 +975,7 @@ def _extract_context(self, tree):
 
     def _extract_html(  # private
         self, problemtree
-    ):  # pylint: disable=too-many-statements,too-many-locals,too-many-branches,too-many-return-statements
+    ):  # pylint: disable=too-many-locals,too-many-branches,too-many-return-statements
         """
         Main (private) function which converts Problem XML tree to HTML.
         Calls itself recursively.
diff --git a/xblocks_contrib/problem/capa/checker.py b/xblocks_contrib/problem/capa/checker.py
index 77eb895c..3ea093ce 100755
--- a/xblocks_contrib/problem/capa/checker.py
+++ b/xblocks_contrib/problem/capa/checker.py
@@ -17,7 +17,7 @@
 log = logging.getLogger("capa.checker")
 
 
-class DemoSystem:  # pylint: disable=too-few-public-methods
+class DemoSystem:
     """Render templates using Django's template engine."""
 
     def __init__(self):
@@ -114,12 +114,15 @@ def check_that_blanks_fail(problem):
 
 
 def check_that_suggested_answers_work(problem):
-    """Split this up so that we're only used for formula/numeric answers.
+    """
+    Split this up so that we're only used for formula/numeric answers.
 
     Examples of where this fails:
+
     * Displayed answers use units but acceptable ones do not.
       - L1e0.xml
       - Presents itself as UndefinedVariable (when it tries to pass to calc)
+
     * "a or d" is what's displayed, but only "a" or "d" is accepted, not the
       string "a or d".
       - L1-e00.xml
diff --git a/xblocks_contrib/problem/capa/customrender.py b/xblocks_contrib/problem/capa/customrender.py
index 8a588944..731fd50f 100644
--- a/xblocks_contrib/problem/capa/customrender.py
+++ b/xblocks_contrib/problem/capa/customrender.py
@@ -23,7 +23,7 @@
 # -----------------------------------------------------------------------------
 
 
-class MathRenderer:  # pylint: disable=too-few-public-methods
+class MathRenderer:
     """
     Renders <math> tags into MathJax-compatible HTML for displaying math expressions.
     """
@@ -63,7 +63,7 @@ def get_html(self):
         html = f"<html><html>{self.mathstr}</html><html>{saxutils.escape(self.xml.tail or '')}</html></html>"
         try:
             xhtml = etree.XML(html)
-        except Exception as err:  # pylint: disable=broad-exception-caught
+        except Exception as err:
             if self.system.DEBUG:
                 msg = (
                     f"<html><div class='inline-error'>"
@@ -85,7 +85,7 @@ def get_html(self):
 # -----------------------------------------------------------------------------
 
 
-class SolutionRenderer:  # pylint: disable=too-few-public-methods
+class SolutionRenderer:
     """
     A solution is just a <span>...</span> which is given an ID, that is used for displaying an
     extended answer (a problem "solution") after "show answers" is pressed.
@@ -113,7 +113,7 @@ def get_html(self):
 # -----------------------------------------------------------------------------
 
 
-class TargetedFeedbackRenderer:  # pylint: disable=too-few-public-methods
+class TargetedFeedbackRenderer:
     """
     A targeted feedback is just a <span>...</span> that is used for displaying an
     extended piece of feedback to students if they incorrectly answered a question.
@@ -138,7 +138,7 @@ def get_html(self):
         try:
             xhtml = etree.XML(html_str)
 
-        except Exception as err:  # pylint: disable=broad-exception-caught
+        except Exception as err:
             if self.system.DEBUG:
                 # xss-lint: disable=python-wrap-html
                 msg = f"""
@@ -163,7 +163,7 @@ def get_html(self):
 # -----------------------------------------------------------------------------
 
 
-class ClarificationRenderer:  # pylint: disable=too-few-public-methods
+class ClarificationRenderer:
     """
     A clarification appears as an inline icon which reveals more information when the user
     hovers over it.
diff --git a/xblocks_contrib/problem/capa/inputtypes.py b/xblocks_contrib/problem/capa/inputtypes.py
index f0e0c2ef..bc8b146c 100644
--- a/xblocks_contrib/problem/capa/inputtypes.py
+++ b/xblocks_contrib/problem/capa/inputtypes.py
@@ -121,7 +121,7 @@ def __hash__(self):
         return hash(str(self))
 
 
-class Attribute:  # pylint: disable=too-few-public-methods
+class Attribute:
     """
     Allows specifying required and optional attributes for input types.
     """
@@ -178,7 +178,7 @@ def parse_from_xml(self, element):
         return val
 
 
-class InputTypeBase:  # pylint: disable=too-many-instance-attributes
+class InputTypeBase:
     """
     Abstract base class for input types.
     """
@@ -451,24 +451,24 @@ def _extra_context(self):
 @registry.register
 class ChoiceGroup(InputTypeBase):
     """
-    Radio button or checkbox inputs: multiple choice or true/false
+    Radio button or checkbox inputs: multiple choice or true/false.
 
-    TODO: allow order of choices to be randomized, following lon-capa spec.  Use
-    "location" attribute, ie random, top, bottom.
+    TODO: allow order of choices to be randomized, following lon-capa spec.
+    Use the "location" attribute, e.g., random, top, bottom.
 
-    Example:
+    Example::
 
-    <choicegroup>
-      <choice correct="false" name="foil1">
-        <text>This is foil One.</text>
-      </choice>
-      <choice correct="false" name="foil2">
-        <text>This is foil Two.</text>
-      </choice>
-      <choice correct="true" name="foil3">
-        <text>This is foil Three.</text>
-      </choice>
-    </choicegroup>
+        <choicegroup>
+        <choice correct="false" name="foil1">
+            <text>This is foil One.</text>
+        </choice>
+        <choice correct="false" name="foil2">
+            <text>This is foil Two.</text>
+        </choice>
+        <choice correct="true" name="foil3">
+            <text>This is foil Three.</text>
+        </choice>
+        </choicegroup>
     """
 
     template = "choicegroup.html"
@@ -500,9 +500,11 @@ def setup(self):
 
     @classmethod
     def get_attributes(cls):
-        # Make '_' a no-op so we can scrape strings. Using lambda instead of
+        # Make '_' a no-op so we can scrape strings. Using function instead of
         #  `django.utils.translation.ugettext_noop` because Django cannot be imported in this file
-        _ = lambda text: text  # pylint: disable=unnecessary-lambda-assignment
+        def _(text):
+            return text
+
         return [Attribute("show_correctness", "always"), Attribute("submitted_message", _("Answer received."))]
 
     def _extra_context(self):
@@ -570,7 +572,7 @@ class JSInput(InputTypeBase):
 
     This in turn means that the iframe cannot directly access the top-level
     window elements.
-      Example:
+    Example:
 
         <jsinput html_file="/static/test.html"
                  gradefn="grade"
@@ -828,10 +830,12 @@ class MatlabInput(CodeInput):
     """
     InputType for handling Matlab code input
 
-    Example:
-     <matlabinput rows="10" cols="80" tabsize="4">
-        Initial Text
-     </matlabinput>
+    Example::
+
+        <matlabinput rows="10" cols="80" tabsize="4">
+            Initial Text
+        </matlabinput>
+
     """
 
     template = "matlabinput.html"
@@ -896,7 +900,8 @@ def ungraded_response(self, queue_msg, queuekey):
 
         Args:
             - queue_msg (str) - message returned from the queue. The message to be rendered
-            - queuekey (str) - a key passed to the queue. Will be matched up to verify that this is the response we're waiting for  # lint-amnesty, pylint: disable=line-too-long
+            - queuekey (str) - a key passed to the queue. Will be matched up to verify that
+                            this is the response we're waiting for
 
         Returns:
             nothing
@@ -1196,11 +1201,13 @@ def preview_chemcalc(self, data):
         Render an html preview of a chemical formula or equation.  get should
         contain a key 'formula' and value 'some formula string'.
 
-        Returns a json dictionary:
-        {
-           'preview' : 'the-preview-html' or ''
-           'error' : 'the-error' or ''
-        }
+        Returns a json dictionary::
+
+            {
+                'preview' : 'the-preview-html' or ''
+                'error' : 'the-error' or ''
+            }
+
         """
 
         _ = self.capa_system.i18n.gettext
@@ -1275,15 +1282,16 @@ def handle_ajax(self, dispatch, data):
 
     def preview_formcalc(self, get):
         """
-        Render an preview of a formula or equation. `get` should
+        Render a preview of a formula or equation. `get` should
         contain a key 'formula' with a math expression.
 
-        Returns a json dictionary:
-        {
-           'preview' : '<some latex>' or ''
-           'error' : 'the-error' or ''
-           'request_start' : <time sent with request>
-        }
+        Returns a JSON dictionary::
+
+            {
+               'preview' : '<some latex>' or '',
+               'error' : 'the-error' or '',
+               'request_start' : <time sent with request>
+            }
         """
         _ = self.capa_system.i18n.gettext
         result = {"preview": "", "error": ""}
@@ -1496,12 +1504,13 @@ def _extra_context(self):
 
 
 @registry.register
-class AnnotationInput(InputTypeBase):  # pylint: disable=too-many-instance-attributes
-    """
-    Input type for annotations: students can enter some notes or other text
-    (currently ungraded), and then choose from a set of tags/optoins, which are graded.
+class AnnotationInput(InputTypeBase):
+    """Input type for annotations.
 
-    Example:
+    Students can enter some notes or other text (currently ungraded), and
+    then choose from a set of tags/options, which are graded.
+
+    Example::
 
         <annotationinput>
             <title>Annotation Exercise</title>
@@ -1509,7 +1518,8 @@ class AnnotationInput(InputTypeBase):  # pylint: disable=too-many-instance-attri
                 They are the ones who, at the public assembly, had put savage derangement [ate] into my thinking
                 [phrenes] |89 on that day when I myself deprived Achilles of his honorific portion [geras]
             </text>
-            <comment>Agamemnon says that ate or 'derangement' was the cause of his actions: why could Zeus say the same thing?</comment>  # lint-amnesty, pylint: disable=line-too-long
+            <comment>Agamemnon says that ate or 'derangement' was the cause of his actions:
+            why could Zeus say the same thing?</comment>
             <comment_prompt>Type a commentary below:</comment_prompt>
             <tag_prompt>Select one tag:</tag_prompt>
             <options>
@@ -1602,61 +1612,64 @@ def _extra_context(self):
 
 @registry.register
 class ChoiceTextGroup(InputTypeBase):
-    r"""
-    Groups of radiobutton/checkboxes with text inputs.
+    r"""Groups of radiobutton/checkboxes with text inputs.
 
     Examples:
-    RadioButton problem
-    <problem>
-      <startouttext/>
-        A person rolls a standard die 100 times and records the results.
-        On the first roll they received a "1". Given this information
-        select the correct choice and fill in numbers to make it accurate.
-      <endouttext/>
-      <choicetextresponse>
-        <radiotextgroup>
-          <choice correct="false">The lowest number rolled was:
-            <decoy_input/> and the highest number rolled was:
-            <decoy_input/> .</choice>
-          <choice correct="true">The lowest number rolled was <numtolerance_input answer="1"/>
-            and there is not enough information to determine the highest number rolled.
-          </choice>
-          <choice correct="false">There is not enough information to determine the lowest
-          number rolled, and the highest number rolled was:
-          <decoy_input/> .
-          </choice>
-        </radiotextgroup>
-      </choicetextresponse>
-    </problem>
-
-    CheckboxProblem:
-    <problem>
-      <startouttext/>
-        A person randomly selects 100 times, with replacement, from the list of numbers \(\sqrt{2}\), 2, 3, 4, 5, 6
-        and records the results. The first number they pick is \(\sqrt{2}\) Given this information
-        select the correct choices and fill in numbers to make them accurate.
-      <endouttext/>
-      <choicetextresponse>
-        <checkboxtextgroup>
-             <choice correct="true">
-                The lowest number selected was <numtolerance_input answer="1.4142" tolerance="0.01"/>
-             </choice>
-             <choice correct="false">
-                The highest number selected was <decoy_input/> .
-            </choice>
-            <choice correct="true">There is not enough information given to determine the highest number
-                which was selected.
-            </choice>
-            <choice correct="false">There is not enough information given to determine the lowest number
-                selected.
-            </choice>
-        </checkboxtextgroup>
-      </choicetextresponse>
-    </problem>
-
-    In the preceding examples the <decoy_input/> is used to generate a textinput html element
-    in the problem's display. Since it is inside of an incorrect choice, no answer given
-    for it will be correct, and thus specifying an answer for it is not needed.
+    **RadioButton Problem**::
+
+        <problem>
+            <startouttext/>
+            A person rolls a standard die 100 times and records the results.
+            On the first roll they received a "1". Given this information
+            select the correct choice and fill in numbers to make it accurate.
+            <endouttext/>
+            <choicetextresponse>
+                <radiotextgroup>
+                    <choice correct="false">The lowest number rolled was:
+                        <decoy_input/> and the highest number rolled was:
+                        <decoy_input/> .
+                    </choice>
+                    <choice correct="true">The lowest number rolled was <numtolerance_input answer="1"/>
+                        and there is not enough information to determine the highest number rolled.
+                    </choice>
+                    <choice correct="false">There is not enough information to determine the lowest
+                        number rolled, and the highest number rolled was:
+                        <decoy_input/> .
+                    </choice>
+                </radiotextgroup>
+            </choicetextresponse>
+        </problem>
+
+    **Checkbox Problem**::
+
+        <problem>
+            <startouttext/>
+            A person randomly selects 100 times, with replacement, from the list of numbers \(\sqrt{2}\), 2, 3, 4, 5, 6
+            and records the results. The first number they pick is \(\sqrt{2}\). Given this information
+            select the correct choices and fill in numbers to make them accurate.
+            <endouttext/>
+            <choicetextresponse>
+                <checkboxtextgroup>
+                    <choice correct="true">
+                        The lowest number selected was <numtolerance_input answer="1.4142" tolerance="0.01"/>
+                    </choice>
+                    <choice correct="false">
+                        The highest number selected was <decoy_input/> .
+                    </choice>
+                    <choice correct="true">There is not enough information given to determine the highest number
+                        which was selected.
+                    </choice>
+                    <choice correct="false">There is not enough information given to determine the lowest number
+                        selected.
+                    </choice>
+                </checkboxtextgroup>
+            </choicetextresponse>
+        </problem>
+
+    .. note::
+        In the preceding examples the <decoy_input/> is used to generate a textinput html element
+        in the problem's display. Since it is inside of an incorrect choice, no answer given
+        for it will be correct, and thus specifying an answer for it is not needed.
     """
 
     template = "choicetext.html"
@@ -1696,9 +1709,12 @@ def get_attributes(cls):
         """
         Returns a list of `Attribute` for this problem type
         """
-        # Make '_' a no-op so we can scrape strings. Using lambda instead of
+
+        # Make '_' a no-op so we can scrape strings. Using function instead of
         #  `django.utils.translation.ugettext_noop` because Django cannot be imported in this file
-        _ = lambda text: text  # pylint: disable=unnecessary-lambda-assignment
+        def _(text):
+            return text
+
         return [
             Attribute("show_correctness", "always"),
             Attribute("submitted_message", _("Answer received.")),
@@ -1715,43 +1731,45 @@ def _extra_context(self):
 
     @staticmethod
     def extract_choices(element, i18n):
-        """
-        Extracts choices from the xml for this problem type.
+        """Extracts choices from the xml for this problem type.
+
         If we have xml that is as follows(choice names will have been assigned
-        by now)
-        <radiotextgroup>
-        <choice correct = "true" name ="1_2_1_choiceinput_0bc">
-            The number
-                <numtolerance_input name = "1_2_1_choiceinput0_numtolerance_input_0" answer="5"/>
-            Is the mean of the list.
-        </choice>
-        <choice correct = "false" name = "1_2_1_choiceinput_1bc>
-            False demonstration choice
-        </choice>
-        </radiotextgroup>
-
-        Choices are used for rendering the problem properly
-        The function will setup choices as follows:
-        choices =[
-            ("1_2_1_choiceinput_0bc",
-                [{'type': 'text', 'contents': "The number", 'tail_text': '',
-                  'value': ''
-                  },
-                  {'type': 'textinput',
-                   'contents': "1_2_1_choiceinput0_numtolerance_input_0",
-                   'tail_text': 'Is the mean of the list',
-                   'value': ''
-                   }
-                ]
-             ),
-            ("1_2_1_choiceinput_1bc",
-                [{'type': 'text', 'contents': "False demonstration choice",
-                 'tail_text': '',
-                  'value': ''
-                  }
-                ]
-            )
-        ]
+        by now)::
+
+            <radiotextgroup>
+                <choice correct="true" name="1_2_1_choiceinput_0bc">
+                    The number
+                    <numtolerance_input name="1_2_1_choiceinput0_numtolerance_input_0" answer="5"/>
+                    Is the mean of the list.
+                </choice>
+                <choice correct="false" name="1_2_1_choiceinput_1bc">
+                    False demonstration choice
+                </choice>
+            </radiotextgroup>
+
+        Choices are used for rendering the problem properly. The function
+        will set up choices as follows::
+
+            choices = [
+                ("1_2_1_choiceinput_0bc",
+                    [{'type': 'text', 'contents': "The number", 'tail_text': '',
+                      'value': ''
+                     },
+                     {'type': 'textinput',
+                      'contents': "1_2_1_choiceinput0_numtolerance_input_0",
+                      'tail_text': 'Is the mean of the list',
+                      'value': ''
+                     }
+                    ]
+                ),
+                ("1_2_1_choiceinput_1bc",
+                    [{'type': 'text', 'contents': "False demonstration choice",
+                      'tail_text': '',
+                      'value': ''
+                     }
+                    ]
+                )
+            ]
         """
 
         _ = i18n.gettext
diff --git a/xblocks_contrib/problem/capa/responsetypes.py b/xblocks_contrib/problem/capa/responsetypes.py
index 0f6cacc2..b304a4fc 100644
--- a/xblocks_contrib/problem/capa/responsetypes.py
+++ b/xblocks_contrib/problem/capa/responsetypes.py
@@ -28,7 +28,6 @@
 import random2 as random
 import requests
 import six
-
 # specific library imports
 from calc import UndefinedVariable, UnmatchedParenthesis, evaluator
 from django.utils import html
@@ -63,9 +62,12 @@
 CorrectMap = correctmap.CorrectMap
 CORRECTMAP_PY = None
 
-# Make '_' a no-op so we can scrape strings. Using lambda instead of
+
+# Make '_' a no-op so we can scrape strings. Using function instead of
 #  `django.utils.translation.ugettext_noop` because Django cannot be imported in this file
-_ = lambda text: text  # pylint: disable=unnecessary-lambda-assignment
+def _(text):
+    return text
+
 
 QUESTION_HINT_CORRECT_STYLE = "feedback-hint-correct"
 QUESTION_HINT_INCORRECT_STYLE = "feedback-hint-incorrect"
@@ -124,7 +126,7 @@ class StudentInputError(Exception):
 # Main base class for CAPA responsetypes
 
 
-class LoncapaResponse(six.with_metaclass(abc.ABCMeta)):  # pylint: disable=too-many-instance-attributes
+class LoncapaResponse(six.with_metaclass(abc.ABCMeta)):
     """
     Base class for CAPA responsetypes.  Each response type (ie a capa question,
     which is part of a capa problem) is represented as a subclass,
@@ -628,15 +630,14 @@ def has_answerpool(self):
 # -----------------------------------------------------------------------------
 @registry.register
 class ChoiceResponse(LoncapaResponse):
-    """
-    This response type is used when the student chooses from a discrete set of
+    """This response type is used when the student chooses from a discrete set of
     choices. Currently, to be marked correct, all "correct" choices must be
     supplied by the student, and no extraneous choices may be included.
 
     This response type allows for two inputtypes: radiogroups and checkbox
-    groups. radiogroups are used when the student should select a single answer,
+    groups. Radiogroups are used when the student should select a single answer,
     and checkbox groups are used when the student may supply 0+ answers.
-    Note: it is suggested to include a "None of the above" choice when no
+    Note: It is suggested to include a "None of the above" choice when no
     answer is correct for a checkboxgroup inputtype; this ensures that a student
     must actively mark something to get credit.
 
@@ -646,33 +647,32 @@ class ChoiceResponse(LoncapaResponse):
     TODO: Allow for marking choices as 'optional' and 'required', which would
     not penalize a student for including optional answers and would also allow
     for questions in which the student can supply one out of a set of correct
-    answers.This would also allow for survey-style questions in which all
+    answers. This would also allow for survey-style questions in which all
     answers are correct.
 
-    Example:
-
-    <choiceresponse>
-        <radiogroup>
-            <choice correct="false">
-                <text>This is a wrong answer.</text>
-            </choice>
-            <choice correct="true">
-                <text>This is the right answer.</text>
-            </choice>
-            <choice correct="false">
-                <text>This is another wrong answer.</text>
-            </choice>
-        </radiogroup>
-    </choiceresponse>
-
-    In the above example, radiogroup can be replaced with checkboxgroup to allow
+    Example::
+
+        <choiceresponse>
+            <radiogroup>
+                <choice correct="false">
+                    <text>This is a wrong answer.</text>
+                </choice>
+                <choice correct="true">
+                    <text>This is the right answer.</text>
+                </choice>
+                <choice correct="false">
+                    <text>This is another wrong answer.</text>
+                </choice>
+            </radiogroup>
+        </choiceresponse>
+
+    In the above example, `radiogroup` can be replaced with `checkboxgroup` to allow
     the student to select more than one choice.
 
     TODO: In order for the inputtypes to render properly, this response type
-    must run setup_response prior to the input type rendering. Specifically, the
+    must run `setup_response` prior to the input type rendering. Specifically, the
     choices must be given names. This behavior seems like a leaky abstraction,
     and it'd be nice to change this at some point.
-
     """
 
     human_name = _("Checkboxes")
@@ -867,15 +867,19 @@ def get_answers(self):
 
     def get_extended_hints(self, student_answers, new_cmap):  # pylint: disable=too-many-locals
         """
-        Extract compound and extended hint information from the xml based on the student_answers.
-        The hint information goes into the msg= in new_cmap for display.
-        Each choice in the checkboxgroup can have 2 extended hints, matching the
-        case that the student has or has not selected that choice:
-          <checkboxgroup label="Select the best snack">
-             <choice correct="true">Donut
-               <choicehint selected="tRuE">A Hint!</choicehint>
-               <choicehint selected="false">Another hint!</choicehint>
-             </choice>
+        Extract compound and extended hint information from the XML based on the student_answers.
+
+        The hint information goes into the `msg=` in `new_cmap` for display.
+
+        Each choice in the checkboxgroup can have two extended hints, matching the
+        case that the student has or has not selected that choice::
+
+            <checkboxgroup label="Select the best snack">
+                <choice correct="true">Donut
+                    <choicehint selected="tRuE">A Hint!</choicehint>
+                    <choicehint selected="false">Another hint!</choicehint>
+                </choice>
+            </checkboxgroup>
         """
         # Tricky: student_answers may be *empty* here. That is the representation that
         # no checkboxes were selected. For typical responsetypes, you look at
@@ -1015,8 +1019,7 @@ def setup_response(self):
 
         correct_choices is a list of the correct choices.
         partial_choices is a list of the partially-correct choices.
-        partial_values is a list of the scores that go with those
-          choices, defaulting to 0.5 if no value is specified.
+        partial_values is a list of the scores that go with those choices, defaulting to 0.5 if no value is specified.
         """
         # call secondary setup for MultipleChoice questions, to set name
         # attributes
@@ -1048,12 +1051,17 @@ def setup_response(self):
 
     def get_extended_hints(self, student_answers, new_cmap):
         """
-        Extract any hints in a <choicegroup> matching the student's answers
-        <choicegroup label="What is your favorite color?" type="MultipleChoice">
-          <choice correct="false">Red
-            <choicehint>No, Blue!</choicehint>
-          </choice>
-          ...
+        Extract any hints in a <choicegroup> matching the student's answers.
+
+        Example::
+
+            <choicegroup label="What is your favorite color?" type="MultipleChoice">
+              <choice correct="false">Red
+                <choicehint>No, Blue!</choicehint>
+              </choice>
+              ...
+            </choicegroup>
+
         Any hint text is installed in the new_cmap.
         """
         if self.answer_id in student_answers:
@@ -1488,8 +1496,8 @@ def get_student_answer_variable_name(self, student_answers, aid):
     def get_extended_hints(self, student_answers, new_cmap):
         """
         Extract optioninput extended hint, e.g.
-        <optioninput>
-          <option correct="True">Donut <optionhint>Of course</optionhint> </option>
+
+        <optioninput><option correct="True">Donut <optionhint>Of course</optionhint> </option>
         """
         answer_id = self.answer_ids[0]  # Note *not* self.answer_id
         if answer_id in student_answers:
@@ -1832,7 +1840,8 @@ class StringResponse(LoncapaResponse):
     Additional answers are added by `additional_answer` tag.
     If `regexp` is in `type` attribute, then answers and hints are treated as regular expressions.
 
-    Examples:
+    Examples::
+
         <stringresponse answer="Michigan">
             <textline size="20" />
         </stringresponse >
@@ -1913,14 +1922,16 @@ def get_extended_hints(self, student_answers, new_cmap):
         """
         Find and install extended hints in new_cmap depending on the student answers.
         StringResponse is probably the most complicated form we have.
-        The forms show below match in the order given, and the first matching one stops the matching.
-        <stringresponse answer="A" type="ci">
-          <correcthint>hint1</correcthint>                         <!-- hint for correct answer -->
-          <additional_answer answer="B">hint2</additional_answer>  <!-- additional_answer with its own hint -->
-          <stringequalhint answer="C">hint3</stringequalhint>      <!-- string matcher/hint for an incorrect answer -->
-          <regexphint answer="FG+">hint4</regexphint>              <!-- regex matcher/hint for an incorrect answer -->
-          <textline size="20"/>
-        </stringresponse>
+        The forms show below match in the order given, and the first matching one stops the matching.::
+
+            <stringresponse answer="A" type="ci">
+            <correcthint>hint1</correcthint>                         <!-- hint for correct answer -->
+            <additional_answer answer="B">hint2</additional_answer>  <!-- additional_answer with its own hint -->
+            <stringequalhint answer="C">hint3</stringequalhint>      <!-- string matcher/hint for an incorrect answer-->
+            <regexphint answer="FG+">hint4</regexphint>              <!-- regex matcher/hint for an incorrect answer -->
+            <textline size="20"/>
+            </stringresponse>
+
         The "ci" and "regexp" options are inherited from the parent stringresponse as appropriate.
         """
         if self.answer_id in student_answers:
@@ -3279,7 +3290,7 @@ class ImageResponse(LoncapaResponse):
 
     If there is only one region in the list, simpler notation can be used:
     regions="[[10,10], [30,30], [10, 30], [30, 10]]" (without explicitly
-        setting outer list)
+    setting outer list)
 
     Returns:
         True, if click is inside any region or rectangle. Otherwise False.
@@ -3368,6 +3379,7 @@ def get_mapped_answers(self):
 
         Input:
             None
+
         Returns:
             tuple (dict, dict) -
                 rectangles (dict) - a map of inputs to the defined rectangle for that input
@@ -3386,9 +3398,9 @@ def get_answers(self):
 
         Input:
             None
+
         Returns:
-            dict (str, (str, str)) - a map of inputs to a tuple of their rectangle
-                and their regions
+            dict (str, (str, str)) - a map of inputs to a tuple of their rectangle and their regions
         """
         answers = {}
         for ielt in self.ielements:
@@ -3552,12 +3564,11 @@ def setup_response(self):
         `correct_inputs`: These are the numerical/string answers for required
         inputs.
         `answer_values`: This is a dict, keyed by the name of the binary choice
-            which contains the correct answers for the text inputs separated by
-            commas e.g. "1, 0.5"
+        which contains the correct answers for the text inputs separated by
+        commas e.g. "1, 0.5"
 
         `correct_choices` and `correct_inputs` are used for grading the problem
         and `answer_values` is used for displaying correct answers.
-
         """
         _ = self.capa_system.i18n.gettext
         context = self.context
@@ -3605,34 +3616,35 @@ def assign_choice_names(self):
         for this response.
 
         Example:
-        Assuming for simplicity that `self.answer_id` = '1_2_1'
-
-        Before the function is called `self.xml` =
-        <radiotextgroup>
-            <choice correct = "true">
-                The number
-                    <numtolerance_input answer="5"/>
-                Is the mean of the list.
-            </choice>
-            <choice correct = "false">
-                False demonstration choice
-            </choice>
-        </radiotextgroup>
-
-        After this is called the choices and numtolerance_inputs will have a name
-        attribute initialized and self.xml will be:
-
-        <radiotextgroup>
-        <choice correct = "true" name ="1_2_1_choiceinput_0bc">
-            The number
-                <numtolerance_input name = "1_2_1_choiceinput0_numtolerance_input_0"
-                 answer="5"/>
-            Is the mean of the list.
-        </choice>
-        <choice correct = "false" name = "1_2_1_choiceinput_1bc>
-            False demonstration choice
-        </choice>
-        </radiotextgroup>
+        Assuming for simplicity that `self.answer_id` = '1_2_1'.
+
+        Before the function is called `self.xml`::
+
+            <radiotextgroup>
+                <choice correct="true">
+                    The number
+                        <numtolerance_input answer="5"/>
+                    Is the mean of the list.
+                </choice>
+                <choice correct="false">
+                    False demonstration choice
+                </choice>
+            </radiotextgroup>
+
+        After this is called, the choices and numtolerance_inputs will have a
+        name attribute initialized and `self.xml` will be::
+
+            <radiotextgroup>
+                <choice correct="true" name="1_2_1_choiceinput_0bc">
+                    The number
+                        <numtolerance_input name="1_2_1_choiceinput0_numtolerance_input_0"
+                        answer="5"/>
+                    Is the mean of the list.
+                </choice>
+                <choice correct="false" name="1_2_1_choiceinput_1bc">
+                    False demonstration choice
+                </choice>
+            </radiotextgroup>
         """
 
         choices = self.xml.xpath("//*[@id=$id]//choice", id=self.xml.get("id"))
diff --git a/xblocks_contrib/problem/capa/safe_exec/lazymod.py b/xblocks_contrib/problem/capa/safe_exec/lazymod.py
index 5f96a768..a956e8c5 100644
--- a/xblocks_contrib/problem/capa/safe_exec/lazymod.py
+++ b/xblocks_contrib/problem/capa/safe_exec/lazymod.py
@@ -8,7 +8,7 @@
 import sys
 
 
-class LazyModule:  # pylint: disable=too-few-public-methods
+class LazyModule:
     """A lazy module proxy."""
 
     def __init__(self, modname):
diff --git a/xblocks_contrib/problem/capa/safe_exec/remote_exec.py b/xblocks_contrib/problem/capa/safe_exec/remote_exec.py
index 16260336..bbcafdef 100644
--- a/xblocks_contrib/problem/capa/safe_exec/remote_exec.py
+++ b/xblocks_contrib/problem/capa/safe_exec/remote_exec.py
@@ -78,9 +78,8 @@ def send_safe_exec_request_v0(data):
     """
     Sends a request to a codejail api service forwarding required code and files.
     Arguments:
-        data: Dict containing code and other parameters
-            required for jailed code execution.
-            It also includes extra_files (python_lib.zip) required by the codejail execution.
+        data: Dict containing code and other parameters required for jailed code execution.
+        It also includes extra_files (python_lib.zip) required by the codejail execution.
     Returns:
         Response received from codejail api service
     """
diff --git a/xblocks_contrib/problem/capa/safe_exec/safe_exec.py b/xblocks_contrib/problem/capa/safe_exec/safe_exec.py
index 6b79d8a4..a6f67b0c 100644
--- a/xblocks_contrib/problem/capa/safe_exec/safe_exec.py
+++ b/xblocks_contrib/problem/capa/safe_exec/safe_exec.py
@@ -106,8 +106,9 @@ def update_hash(hasher, obj):
         hasher.update(repr(obj).encode())
 
 
+# pylint: disable=too-many-arguments,too-many-branches,too-many-locals,too-many-positional-arguments,too-many-statements
 @function_trace("safe_exec")
-def safe_exec(  # pylint: disable=too-many-arguments,too-many-branches,too-many-locals,too-many-positional-arguments,too-many-statements
+def safe_exec(
     code,
     globals_dict,
     random_seed=None,
@@ -210,7 +211,7 @@ def safe_exec(  # pylint: disable=too-many-arguments,too-many-branches,too-many-
                     limit_overrides_context=limit_overrides_context,
                     slug=slug,
                 )
-        except BaseException as e:  # pylint: disable=broad-exception-caught
+        except BaseException as e:
             # Saving SafeExecException e in exception to be used later.
             exception = e
             emsg = str(e)
@@ -263,7 +264,7 @@ def safe_exec(  # pylint: disable=too-many-arguments,too-many-branches,too-many-
                     # SafeExecException wrapped around emsg (if present).
                     remote_emsg, _ = get_remote_exec(data)
                     remote_exception = None
-            except BaseException as e:  # pragma: no cover  # pylint: disable=broad-exception-caught
+            except BaseException as e:
                 # Swallow all exceptions and log it in monitoring so that dark launch doesn't cause issues during
                 # deploy.
                 remote_emsg = None
@@ -282,7 +283,7 @@ def safe_exec(  # pylint: disable=too-many-arguments,too-many-branches,too-many-
                     emsg_remote=remote_emsg,
                     unexpected_exc_remote=remote_exception,
                 )
-            except BaseException:  # pragma: no cover  # pylint: disable=broad-exception-caught
+            except BaseException:
                 log.exception("Error occurred while trying to report codejail darklaunch data.")
                 record_exception()
 
@@ -376,7 +377,7 @@ def emsg_normalizers():
     custom_setting = getattr(settings, "CODEJAIL_DARKLAUNCH_EMSG_NORMALIZERS", [])
     try:
         custom_normalizers = _compile_normalizers(custom_setting)
-    except BaseException:  # pylint: disable=broad-exception-caught
+    except BaseException:
         log.error("Could not load custom codejail darklaunch emsg normalizers")
         record_exception()
         return default_normalizers
diff --git a/xblocks_contrib/problem/capa/safe_exec/tests/test_lazymod.py b/xblocks_contrib/problem/capa/safe_exec/tests/test_lazymod.py
index 543782ee..fcc30973 100644
--- a/xblocks_contrib/problem/capa/safe_exec/tests/test_lazymod.py
+++ b/xblocks_contrib/problem/capa/safe_exec/tests/test_lazymod.py
@@ -6,7 +6,7 @@
 from xblocks_contrib.problem.capa.safe_exec.lazymod import LazyModule
 
 
-class ModuleIsolation:  # pylint: disable=too-few-public-methods
+class ModuleIsolation:
     """
     Manage changes to sys.modules so that we can roll back imported modules.
 
diff --git a/xblocks_contrib/problem/capa/safe_exec/tests/test_safe_exec.py b/xblocks_contrib/problem/capa/safe_exec/tests/test_safe_exec.py
index faca948e..560c6abc 100644
--- a/xblocks_contrib/problem/capa/safe_exec/tests/test_safe_exec.py
+++ b/xblocks_contrib/problem/capa/safe_exec/tests/test_safe_exec.py
@@ -109,8 +109,10 @@ def test_cant_do_something_forbidden(self):
         are encouraged to run this test locally with CodeJail configured.
 
         See setup instructions:
-        * in-platform setup: https://github.com/openedx/xblocks-contrib/blob/main/xblocks_contrib/problem/capa/safe_exec/README.rst
-        * remote setup (using Tutor): https://github.com/eduNEXT/tutor-contrib-codejail
+        * in-platform setup:
+        https://github.com/openedx/xblocks-contrib/blob/main/xblocks_contrib/problem/capa/safe_exec/README.rst
+        * remote setup (using Tutor):
+        https://github.com/eduNEXT/tutor-contrib-codejail
         """
         # If in-platform codejail isn't configured...
         if not jail_code.is_configured("python"):
@@ -218,7 +220,7 @@ def run_dark_launch(  # pylint: disable=too-many-positional-arguments,too-many-a
                     limit_overrides_context="course-v1:org+course+run",
                     slug="hw1",
                 )
-            except BaseException as e:  # pylint: disable=broad-exception-caught
+            except BaseException as e:
                 safe_exec_e = e
             else:
                 safe_exec_e = None
@@ -310,7 +312,7 @@ def test_remote_runs_even_if_local_raises(self):
 
         def local_exec(code, globals_dict, **kwargs):
             # Raise something other than a SafeExecException.
-            raise expected_error  # pylint: disable=broad-exception-raised
+            raise expected_error
 
         def remote_exec(data):  # pylint: disable=unused-argument
             return (None, None)
diff --git a/xblocks_contrib/problem/capa/tests/helpers.py b/xblocks_contrib/problem/capa/tests/helpers.py
index 40764a5a..a91aabf1 100644
--- a/xblocks_contrib/problem/capa/tests/helpers.py
+++ b/xblocks_contrib/problem/capa/tests/helpers.py
@@ -38,7 +38,7 @@ def tst_render_template(template, context):  # pylint: disable=unused-argument
     return f"<div>{saxutils.escape(repr(context))}</div>"
 
 
-class StubXQueueService:  # pylint: disable=too-few-public-methods
+class StubXQueueService:
     """
     Stubs out the XQueueService for Capa problem tests.
     """
diff --git a/xblocks_contrib/problem/capa/tests/response_xml_factory.py b/xblocks_contrib/problem/capa/tests/response_xml_factory.py
index 034af745..fbba69ac 100644
--- a/xblocks_contrib/problem/capa/tests/response_xml_factory.py
+++ b/xblocks_contrib/problem/capa/tests/response_xml_factory.py
@@ -30,14 +30,14 @@ def create_input_element(self, **kwargs):
 
     def build_xml(self, **kwargs):  # pylint: disable=too-many-locals
         """Construct an XML string for a capa response
-        based on **kwargs.
+        based on ``**kwargs``.
 
-        **kwargs is a dictionary that will be passed
+        ``**kwargs`` is a dictionary that will be passed
         to create_response_element() and create_input_element().
         See the subclasses below for other keyword arguments
         you can specify.
 
-        For all response types, **kwargs can contain:
+        For all response types, ``**kwargs`` can contain:
 
         *question_text*: The text of the question to display,
             wrapped in <label> tags.
@@ -108,7 +108,7 @@ def build_xml(self, **kwargs):  # pylint: disable=too-many-locals
     def textline_input_xml(**kwargs):
         """Create a <textline/> XML element
 
-        Uses **kwargs:
+        Uses ``**kwargs``:
 
         *math_display*: If True, then includes a MathJax display of user input
 
@@ -135,7 +135,7 @@ def textline_input_xml(**kwargs):
     def choicegroup_input_xml(**kwargs):
         """Create a <choicegroup> XML element
 
-        Uses **kwargs:
+        Uses ``**kwargs``:
 
         *choice_type*: Can be "checkbox", "radio", or "multiple"
 
@@ -145,7 +145,7 @@ def choicegroup_input_xml(**kwargs):
                             to be marked correct.
                             DEFAULT: [True]
 
-        *choice_names": List of strings identifying the choices.
+        *choice_names*: List of strings identifying the choices.
                         If specified, you must ensure that
                         len(choice_names) == len(choices)
 
@@ -199,7 +199,7 @@ class NumericalResponseXMLFactory(ResponseXMLFactory):
 
     def create_response_element(self, **kwargs):
         """Create a <numericalresponse> XML element.
-        Uses **kwarg keys:
+        Uses ``**kwarg`` keys:
 
         *answer*: The correct answer (e.g. "5")
 
@@ -271,11 +271,9 @@ class CustomResponseXMLFactory(ResponseXMLFactory):
 
     def create_response_element(self, **kwargs):
         """Create a <customresponse> XML element.
+        Uses ``**kwargs``:
 
-        Uses **kwargs:
-
-        *cfn*: the Python code to run.  Can be inline code,
-        or the name of a function defined in earlier <script> tags.
+        *cfn*: the Python code to run.  Can be inline code, or the name of a function defined in earlier <script> tags.
 
         Should have the form: cfn(expect, answer_given, student_answers)
         where expect is a value (see below),
@@ -375,7 +373,7 @@ def create_response_element(self, **kwargs):
         """
         Create a <coderesponse> XML element.
 
-        Uses **kwargs:
+        Uses ``**kwargs``:
 
         *initial_display*: The code that initially appears in the textbox
                             [DEFAULT: "Enter code here"]
@@ -564,7 +562,7 @@ def create_response_element(self, **kwargs):
     def create_input_element(self, **kwargs):
         """Create the <imageinput> element.
 
-        Uses **kwargs:
+        Uses ``**kwargs``:
 
         *src*: URL for the image file [DEFAULT: "/static/image.jpg"]
 
@@ -582,8 +580,7 @@ def create_input_element(self, **kwargs):
 
         *regions*: String representing the regions a user can select
 
-                    Take the form "[ [[x1,y1], [x2,y2], [x3,y3]],
-                                    [[x1,y1], [x2,y2], [x3,y3]] ]"
+                    Take the form "[ [[x1,y1], [x2,y2], [x3,y3]], [[x1,y1], [x2,y2], [x3,y3]] ]"
                     (Defines two regions, each with 3 points)
 
         REQUIRED: Either *rectangle* or *region* (or both)
@@ -661,10 +658,9 @@ def create_response_element(self, **kwargs):
     def create_input_element(self, **kwargs):
         """Create the <optioninput> element.
 
-        Uses **kwargs:
+        Uses ``**kwargs``:
 
-        *options*: a list of possible options the user can choose from [REQUIRED]
-                    You must specify at least 2 options.
+        *options*: a list of possible options the user can choose from [REQUIRED] You must specify at least 2 options.
         *correct_option*: the correct choice from the list of options [REQUIRED]
         """
 
@@ -696,7 +692,7 @@ class StringResponseXMLFactory(ResponseXMLFactory):
     def create_response_element(self, **kwargs):  # pylint: disable=too-many-locals
         """Create a <stringresponse> XML element.
 
-        Uses **kwargs:
+        Uses ``**kwargs``:
 
         *answer*: The correct answer (a string) [REQUIRED]
 
@@ -816,7 +812,7 @@ class SymbolicResponseXMLFactory(ResponseXMLFactory):
     def create_response_element(self, **kwargs):
         """Build the <symbolicresponse> XML element.
 
-        Uses **kwargs:
+        Uses ``**kwargs``:
 
         *expect*: The correct answer (a sympy string)
 
diff --git a/xblocks_contrib/problem/capa/tests/test_inputtypes.py b/xblocks_contrib/problem/capa/tests/test_inputtypes.py
index 0145e771..6306e382 100644
--- a/xblocks_contrib/problem/capa/tests/test_inputtypes.py
+++ b/xblocks_contrib/problem/capa/tests/test_inputtypes.py
@@ -469,7 +469,7 @@ def test_rendering(self):
         assert context == expected
 
 
-class MatlabTest(unittest.TestCase):  # pylint: disable=too-many-instance-attributes
+class MatlabTest(unittest.TestCase):
     """
     Test Matlab input types
     """
@@ -1606,12 +1606,16 @@ def check_group(self, tag, choice_tag, expected_input_type):  # pylint: disable=
         `choice_tag` is either 'choice' for proper xml, or any other value to trigger an error.
         `expected_input_type` is either 'radio' or 'checkbox'.
         """
-        xml_str = """
-  <{tag}>
-      <{choice_tag} correct="false" name="choiceinput_0">this is<numtolerance_input name="choiceinput_0_textinput_0"/>false</{choice_tag}>
-      <choice correct="true" name="choiceinput_1">Is a number<decoy_input name="choiceinput_1_textinput_0"/><text>!</text></choice>
-  </{tag}>
-        """.format(tag=tag, choice_tag=choice_tag)
+        xml_str = (
+            f"<{tag}>"
+            f'<{choice_tag} correct="false" name="choiceinput_0">'
+            f'this is<numtolerance_input name="choiceinput_0_textinput_0"/>false'
+            f"</{choice_tag}>"
+            f'<choice correct="true" name="choiceinput_1">'
+            f'Is a number<decoy_input name="choiceinput_1_textinput_0"/><text>!</text>'
+            f"</choice>"
+            f"</{tag}>"
+        )
         element = etree.fromstring(xml_str)
         prob_id = "choicetext_input"
         state = {"value": "{}", "id": prob_id, "status": inputtypes.Status("answered"), "response_data": RESPONSE_DATA}
diff --git a/xblocks_contrib/problem/capa/tests/test_responsetypes.py b/xblocks_contrib/problem/capa/tests/test_responsetypes.py
index 6b4fa50f..e93d4340 100644
--- a/xblocks_contrib/problem/capa/tests/test_responsetypes.py
+++ b/xblocks_contrib/problem/capa/tests/test_responsetypes.py
@@ -55,7 +55,7 @@ class ResponseTest(unittest.TestCase):
     def setUp(self):
         super().setUp()
         if self.xml_factory_class:
-            self.xml_factory = self.xml_factory_class()  # pylint: disable=not-callable
+            self.xml_factory = self.xml_factory_class()
 
     def build_problem(self, capa_system=None, **kwargs):
         """Build a Loncapa problem using the XML factory and provided arguments."""
@@ -702,8 +702,9 @@ def test_backslash_and_unicode_regexps(self):
 
         Example of real use case in Studio:
             a) user inputs regexp in usual regexp language,
-            b) regexp is saved to xml and is read in python as repr of that string
-            So  a\d in front-end editor will become a\\\\d in xml,  so it will match a1 as student answer.
+            b) regexp is saved to xml and is read in python as repr of that string.
+
+        So  a\d in front-end editor will become a\\\\d in xml,  so it will match a1 as student answer.
         """
         problem = self.build_problem(answer="5\\\\æ", case_sensitive=False, regexp=True)
         self.assert_grade(problem, "5\\æ", "correct")
@@ -1309,7 +1310,7 @@ def test_contextualized_choices(self):
 
 
 @UseUnsafeCodejail()
-class NumericalResponseTest(ResponseTest):  # pylint: disable=too-many-public-methods
+class NumericalResponseTest(ResponseTest):
     """Unit and integration tests for the NumericalResponse class."""
 
     xml_factory_class = NumericalResponseXMLFactory
@@ -1585,7 +1586,7 @@ def test_responsetype_i18n(self, mock_log):  # pylint: disable=unused-argument
         staff_ans = "clearly bad syntax )[+1e"
         problem = self.build_problem(answer=staff_ans, tolerance=1e-3)
 
-        class FakeTranslations:  # pylint: disable=too-few-public-methods
+        class FakeTranslations:
             """A fake gettext.Translations object."""
 
             def ugettext(self, text):
@@ -1629,7 +1630,7 @@ def evaluator_side_effect(_, __, math_string):
 
     def test_err_handling(self):
         """
-        See that `StudentInputError`s are raised when things go wrong.
+        See that StudentInputError are raised when things go wrong.
         """
         problem = self.build_problem(answer=4)
 
@@ -1673,7 +1674,7 @@ def test_validate_answer(self):
 
 
 @UseUnsafeCodejail()
-class CustomResponseTest(ResponseTest):  # pylint: disable=too-many-public-methods
+class CustomResponseTest(ResponseTest):
     """Unit tests for validating CustomResponse behavior"""
 
     xml_factory_class = CustomResponseXMLFactory
diff --git a/xblocks_contrib/problem/capa/tests/test_shuffle.py b/xblocks_contrib/problem/capa/tests/test_shuffle.py
index 3b52f057..d7682318 100644
--- a/xblocks_contrib/problem/capa/tests/test_shuffle.py
+++ b/xblocks_contrib/problem/capa/tests/test_shuffle.py
@@ -293,7 +293,7 @@ def test_multiple_shuffle_responses(self):
             + r"<div>.*\[.*'C'.*'A'.*'D'.*'B'.*\].*</div>",
         )
         # Look at the responses in their authored order
-        responses = sorted(list(problem.responders.values()), key=lambda resp: int(resp.id[resp.id.rindex("_") + 1 :]))
+        responses = sorted(list(problem.responders.values()), key=lambda resp: int(resp.id[resp.id.rindex("_") + 1:]))
         assert not responses[0].has_mask()
         assert responses[0].has_shuffle()
         assert responses[1].has_shuffle()
diff --git a/xblocks_contrib/problem/capa/util.py b/xblocks_contrib/problem/capa/util.py
index 847903f5..8533991b 100644
--- a/xblocks_contrib/problem/capa/util.py
+++ b/xblocks_contrib/problem/capa/util.py
@@ -49,7 +49,8 @@ def compare_with_tolerance(student_complex, instructor_complex, tolerance=DEFAUL
      Default tolerance is relative, as the acceptable difference between two
      floats depends on the magnitude of the floats.
      (http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/)
-     Examples:
+     Examples::
+
         In [183]: 0.000016 - 1.6*10**-5
         Out[183]: -3.3881317890172014e-21
         In [212]: 1.9e24 - 1.9*10**24
diff --git a/xblocks_contrib/problem/capa/xqueue_interface.py b/xblocks_contrib/problem/capa/xqueue_interface.py
index 93ded3f3..11dcd0dc 100644
--- a/xblocks_contrib/problem/capa/xqueue_interface.py
+++ b/xblocks_contrib/problem/capa/xqueue_interface.py
@@ -39,7 +39,8 @@ def make_xheader(lms_callback_url, lms_key, queue_name):
     """
     Generate header for delivery and reply of queue request.
 
-    Xqueue header is a JSON-serialized dict:
+    Xqueue header is a JSON-serialized dict::
+
         { 'lms_callback_url': url to which xqueue will return the request (string),
           'lms_key': secret key used by LMS to protect its state (string),
           'queue_name': designate a specific queue within xqueue server, e.g. 'MITx-6.00x' (string)
@@ -50,7 +51,8 @@ def make_xheader(lms_callback_url, lms_key, queue_name):
 
 def parse_xreply(xreply):
     """
-    Parse the reply from xqueue. Messages are JSON-serialized dict:
+    Parse the reply from xqueue. Messages are JSON-serialized dict::
+
         { 'return_code': 0 (success), 1 (fail)
           'content': Message from xqueue (string)
         }
@@ -67,10 +69,10 @@ def parse_xreply(xreply):
     return (return_code, content)
 
 
-class XQueueInterface:  # pylint: disable=too-few-public-methods
+class XQueueInterface:
     """Initializes the XQueue interface."""
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-positional-arguments
         self,
         url: str,
         django_auth: Dict[str, str],
@@ -156,7 +158,7 @@ def _send_to_queue(self, header, body, files_to_upload):
             return self._http_post(self.url + "/xqueue/submit/", payload, files=files)
 
         header_info = json.loads(header)
-        queue_key = header_info["lms_key"]  # pylint: disable=unused-variable
+        queue_key = header_info["lms_key"]
 
         if self.use_submission_service:
             submission = self.submission.send_to_submission(  # pylint: disable=unused-variable
diff --git a/xblocks_contrib/problem/capa_block.py b/xblocks_contrib/problem/capa_block.py
index b8962fe4..3e6f9a84 100644
--- a/xblocks_contrib/problem/capa_block.py
+++ b/xblocks_contrib/problem/capa_block.py
@@ -59,9 +59,12 @@
 
 log = logging.getLogger("edx.courseware")
 
-# Make '_' a no-op so we can scrape strings. Using lambda instead of
+
+# Make '_' a no-op so we can scrape strings. Using function instead of
 #  `django.utils.translation.gettext_noop` because Django cannot be imported in this file
-_ = lambda text: text  # pylint: disable=unnecessary-lambda-assignment
+def _(text):
+    return text
+
 
 # The global (course-agnostic) anonymous user ID for the user.
 ATTR_KEY_DEPRECATED_ANONYMOUS_USER_ID = "edx-platform.deprecated_anonymous_user_id"
@@ -85,6 +88,7 @@ class SerializationError(Exception):
     """
     Thrown when a module cannot be exported to XML
     """
+
     def __init__(self, location, msg):
         super().__init__(msg)
         self.location = location
@@ -214,7 +218,6 @@ def bind_for_student(self, user_id, wrappers=None):
         # Skip rebinding if we're already bound a user, and it's this user.
         if self.scope_ids.user_id is not None and user_id == self.scope_ids.user_id:
             if getattr(self.runtime, "position", None):
-                # pylint: disable=attribute-defined-outside-init
                 self.position = self.runtime.position  # update the position of the tab
             return
 
@@ -246,7 +249,7 @@ def bind_for_student(self, user_id, wrappers=None):
             wrapped_field_data = self.runtime.service(self, "field-data-unbound")
             for wrapper in wrappers:
                 wrapped_field_data = wrapper(wrapped_field_data)
-            self._bound_field_data = wrapped_field_data  # pylint: disable=attribute-defined-outside-init
+            self._bound_field_data = wrapped_field_data
             if getattr(self.runtime, "uses_deprecated_field_data", False):
                 # This approach is deprecated but OldModuleStoreRuntime still requires it.
                 # For SplitModuleStoreRuntime, don't set ._field_data this way.
@@ -304,7 +307,7 @@ def xmodule_handler(self, request, suffix=None):
         XBlock handler that wraps `handle_ajax`
         """
 
-        class FileObjForWebobFiles:  # pylint: disable=too-few-public-methods
+        class FileObjForWebobFiles:
             """
             Turn Webob cgi.FieldStorage uploaded files into pure file objects.
 
@@ -377,7 +380,7 @@ def default(self, key):
         return self.inherited_settings[key.field_name]
 
 
-class XmlMixin(LegacyXmlMixin):
+class XmlMixin(LegacyXmlMixin):  # pylint: disable=abstract-method
     """
     TODO: This mixin is legacy tech debt. Transition toward modern XBlock
     serialization and remove this legacy XML parsing logic.
@@ -479,7 +482,7 @@ def parse_xml(cls, node, runtime, keys):
         return xblock
 
 
-class SHOWANSWER:  # pylint: disable=too-few-public-methods
+class SHOWANSWER:
     """
     Constants for when to show answer
     """
@@ -498,7 +501,7 @@ class SHOWANSWER:  # pylint: disable=too-few-public-methods
     ATTEMPTED_NO_PAST_DUE = "attempted_no_past_due"
 
 
-class GRADING_METHOD:  # pylint: disable=too-few-public-methods,invalid-name
+class GRADING_METHOD:
     """
     Constants for grading method options.
     """
@@ -509,7 +512,7 @@ class GRADING_METHOD:  # pylint: disable=too-few-public-methods,invalid-name
     AVERAGE_SCORE = "average_score"
 
 
-class RANDOMIZATION:  # pylint: disable=too-few-public-methods
+class RANDOMIZATION:
     """
     Constants for problem randomization
     """
@@ -520,7 +523,7 @@ class RANDOMIZATION:  # pylint: disable=too-few-public-methods
     PER_STUDENT = "per_student"
 
 
-class Randomization(String):  # pylint: disable=too-few-public-methods
+class Randomization(String):
     """
     Define a field to store how to randomize a problem.
     """
@@ -545,7 +548,7 @@ def from_json(self, value):
 @XBlock.needs("xqueue")
 @XBlock.needs("replace_urls")
 @XBlock.wants("call_to_action")
-class ProblemBlock(  # pylint: disable=too-many-public-methods,too-many-instance-attributes,too-many-ancestors
+class ProblemBlock(
     ScorableXBlockMixin,
     RawMixin,
     XmlMixin,
@@ -819,10 +822,13 @@ def handle_ajax(self, dispatch, data):  # pylint: disable=too-many-locals
 
         `data` is request.POST.
 
-        Returns a json dictionary:
-        { 'progress_changed' : True/False,
-          'progress' : 'none'/'in_progress'/'done',
-          <other request-specific values here > }
+        Returns a json dictionary::
+
+            {
+                'progress_changed': True/False,
+                'progress': 'none'/'in_progress'/'done',
+                <other request-specific values here>
+            }
         """
         # self.score is initialized in self.lcp but in this method is accessed before self.lcp so just call it first.
         self.lcp  # pylint: disable=pointless-statement
@@ -1030,7 +1036,7 @@ def index_dictionary(self):
         xblock_body["problem_types"] = list(self.problem_types)
         return xblock_body
 
-    def has_support(self, view, functionality):  # pylint: disable=unused-argument
+    def has_support(self, view, functionality):
         """
         Override the XBlock.has_support method to return appropriate
         value for the multi-device functionality.
@@ -1090,12 +1096,13 @@ def generate_report_data(self, user_state_iterator, limit_responses=None):
                 Set to None (default) to include all.
 
         Returns:
-            each call returns a tuple like:
-            ("username", {
-                           "Question": "2 + 2 equals how many?",
-                           "Answer": "Four",
-                           "Answer ID": "98e6a8e915904d5389821a94e48babcf_10_1"
-            })
+            each call returns a tuple like::
+
+                ("username", {
+                    "Question": "2 + 2 equals how many?",
+                    "Answer": "Four",
+                    "Answer ID": "98e6a8e915904d5389821a94e48babcf_10_1"
+                })
         """
         if self.category != "problem":
             raise NotImplementedError()
@@ -1385,7 +1392,7 @@ def get_html(self):
                 "total_possible": total_possible,
                 "attempts_used": self.attempts,
                 "content": self.get_problem_html(encapsulate=False),
-                "graded": self.graded,  # pylint: disable=no-member
+                "graded": self.graded,
             },
         )
 
@@ -2425,12 +2432,17 @@ def get_submission_metadata(self, answers, correct_map):
 
                 question (str): Is the prompt that was presented to the student.  It corresponds to the
                     label of the input.
+
                 answer (mixed): Is the answer the student provided.  This may be a rich structure,
                     however it must be json serializable.
+
                 response_type (str): The XML tag of the capa response type.
+
                 input_type (str): The XML tag of the capa input type.
+
                 correct (bool): Whether or not the provided answer is correct.  Will be an empty
                     string if correctness could not be determined.
+
                 variant (str): In some cases the same question can have several different variants.
                     This string should uniquely identify the variant of the question that was answered.
                     In the capa context this corresponds to the `seed`.
diff --git a/xblocks_contrib/problem/stringify.py b/xblocks_contrib/problem/stringify.py
index 2b631cbd..ad3df32c 100644
--- a/xblocks_contrib/problem/stringify.py
+++ b/xblocks_contrib/problem/stringify.py
@@ -7,8 +7,11 @@ def stringify_children(node):
     """
     Return all contents of an xml tree, without the outside tags.
     e.g. if node is parse of
+
         "<html a="b" foo="bar">Hi <div>there <span>Bruce</span><b>!</b></div><html>"
+
     should return
+
         "Hi <div>there <span>Bruce</span><b>!</b></div>"
 
     fixed from
diff --git a/xblocks_contrib/problem/tests/test_capa_block.py b/xblocks_contrib/problem/tests/test_capa_block.py
index c73d0aa2..00514ab5 100644
--- a/xblocks_contrib/problem/tests/test_capa_block.py
+++ b/xblocks_contrib/problem/tests/test_capa_block.py
@@ -30,11 +30,7 @@
 
 from xblocks_contrib.problem.capa import responsetypes
 from xblocks_contrib.problem.capa.correctmap import CorrectMap
-from xblocks_contrib.problem.capa.responsetypes import (
-    LoncapaProblemError,
-    ResponseError,
-    StudentInputError,
-)
+from xblocks_contrib.problem.capa.responsetypes import LoncapaProblemError, ResponseError, StudentInputError
 from xblocks_contrib.problem.capa.tests.test_util import UseUnsafeCodejail
 from xblocks_contrib.problem.capa.xqueue_interface import XQueueInterface
 from xblocks_contrib.problem.capa_block import ComplexEncoder, ProblemBlock
@@ -75,7 +71,7 @@ class XBlockUserState(namedtuple("_XBlockUserState", ["username", "block_key", "
     __slots__ = ()
 
     def __repr__(self):
-        return "{}{!r}".format(self.__class__.__name__, tuple(self))  # pylint: disable=consider-using-f-string
+        return "{}{!r}".format(self.__class__.__name__, tuple(self))
 
 
 class CapaFactory:
@@ -232,7 +228,7 @@ class CapaFactoryWithFiles(CapaFactory):
 
 @ddt.ddt
 @pytest.mark.django_db
-class ProblemBlockTest(unittest.TestCase):  # pylint: disable=too-many-public-methods
+class ProblemBlockTest(unittest.TestCase):
     """Tests for various problem types in XBlocks."""
 
     def setUp(self):
@@ -802,10 +798,10 @@ def test_parse_get_params(self):
 
         # Expect that we get a dict with "input" stripped from key names
         # and that we get the same values back
-        for key in result:
+        for key, value in result.items():
             original_key = "input_" + key
             assert original_key in valid_get_dict, f"Output dict should have key {original_key}"
-            assert valid_get_dict[original_key] == result[key]
+            assert valid_get_dict[original_key] == value
 
         # Valid GET param dict with list keys
         # Each tuple represents a single parameter in the query string
@@ -2439,8 +2435,10 @@ def test_image_hint(self, render_template):
             </multiplechoiceresponse>
             <demandhint>
               <hint>
-                <img src="/static/7b1d74b2383b7d25a70ae4991190c222_28-collection-of-dark-souls-bonfire-clipart-high-quality-free-_1200-1386.jpeg"> </img>
-                You can add an optional hint like this. Problems that have a hint include a hint button, and this text appears the first time learners select the button.</hint>
+                <img src="/static/7b1d74b2383b7d25a70ae4991190c222_28-collection-of-dark-souls-bonfire-\
+                    clipart-high-quality-free-_1200-1386.jpeg"> </img>
+                You can add an optional hint like this. Problems that have a hint include a hint button,
+                and this text appears the first time learners select the button.</hint>
             </demandhint>
             </problem>"""
         render_template.return_value = "<div>Test Template HTML</div>"