From 07df64eb8cf0e5ab5a63c8ab338838284c22f593 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Fri, 27 Sep 2019 14:36:40 -0400
Subject: [PATCH] Fix the rest of these.

---
 common/lib/capa/capa/inputtypes.py        | 2 +-
 common/lib/xmodule/xmodule/capa_base.py   | 2 +-
 common/lib/xmodule/xmodule/capa_module.py | 2 +-
 common/lib/xmodule/xmodule/graders.py     | 2 +-
 common/lib/xmodule/xmodule/html_module.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 1f3bba51dc..e8fdc225af 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -258,7 +258,7 @@ class InputTypeBase(object):
             msg = u"Error in xml '{x}': {err} ".format(
                 x=etree.tostring(xml), err=text_type(err))
             msg = Exception(msg)
-            six.reraise(Exception, msg, sys.exc_info()[2])
+            six.reraise(Exception, Exception(msg), sys.exc_info()[2])
 
     @classmethod
     def get_attributes(cls):
diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py
index 52d474cdfb..cd5daa5218 100644
--- a/common/lib/xmodule/xmodule/capa_base.py
+++ b/common/lib/xmodule/xmodule/capa_base.py
@@ -294,7 +294,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
         except Exception as err:  # pylint: disable=broad-except
             msg = u'cannot create LoncapaProblem {loc}: {err}'.format(
                 loc=text_type(self.location), err=err)
-            six.reraise(Exception(msg), None, sys.exc_info()[2])
+            six.reraise(Exception, Exception(msg), sys.exc_info()[2])
 
         if self.score is None:
             self.set_score(self.score_from_lcp(lcp))
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index c4aac4cf7d..73dab43d00 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -200,7 +200,7 @@ class ProblemBlock(
                 self.scope_ids.user_id
             )
             _, _, traceback_obj = sys.exc_info()  # pylint: disable=redefined-outer-name
-            six.reraise(ProcessingError(generic_error_message), None, traceback_obj)
+            six.reraise(ProcessingError, ProcessingError(generic_error_message), traceback_obj)
 
         after = self.get_progress()
         after_attempts = self.attempts
diff --git a/common/lib/xmodule/xmodule/graders.py b/common/lib/xmodule/xmodule/graders.py
index cb9ebd6149..4d91cad5e3 100644
--- a/common/lib/xmodule/xmodule/graders.py
+++ b/common/lib/xmodule/xmodule/graders.py
@@ -193,7 +193,7 @@ def grader_from_conf(conf):
             msg = ("Unable to parse grader configuration:\n    " +
                    str(subgraderconf) +
                    "\n    Error was:\n    " + str(error))
-            six.reraise(ValueError(msg), None, sys.exc_info()[2])
+            six.reraise(ValueError, ValueError(msg), sys.exc_info()[2])
 
     return WeightedSubsectionsGrader(subgraders)
 
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index e0241f68a1..17010bcc79 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -291,7 +291,7 @@ class HtmlBlock(
                 msg = 'Unable to load file contents at path {0}: {1} '.format(
                     filepath, err)
                 # add more info and re-raise
-                six.reraise(Exception(msg), None, sys.exc_info()[2])
+                six.reraise(Exception, Exception(msg), sys.exc_info()[2])
 
     @classmethod
     def parse_xml_new_runtime(cls, node, runtime, keys):