From f52a0f6b983fa2e515c8565ad8c923cafea1d776 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Wed, 11 Dec 2019 11:35:58 -0500
Subject: [PATCH] Re-raise issue was in codejail.
- Undo the previous change.
- Pull in the version of codejail with the fix for the issue.
---
common/lib/capa/capa/capa_problem.py | 2 +-
requirements/edx/base.txt | 2 +-
requirements/edx/development.txt | 2 +-
requirements/edx/github.in | 2 +-
requirements/edx/testing.txt | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index ef3554641a6..ee327dde529 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -897,7 +897,7 @@ class LoncapaProblem(object):
except Exception as err:
log.exception("Error while execing script code: " + all_code)
msg = Text("Error while executing script code: %s" % str(err))
- six.reraise(responsetypes.LoncapaProblemError, responsetypes.LoncapaProblemError(msg))
+ raise responsetypes.LoncapaProblemError(msg)
# Store code source in context, along with the Python path needed to run it correctly.
context['script_code'] = all_code
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 7a577dc8dc4..cc08b376b65 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -6,7 +6,7 @@
#
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
-e common/lib/capa
--e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail
+-e git+https://github.com/edx/codejail.git@17b45de7191f561e9a2c1b12c89489a8ba8e0758#egg=codejail
-e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki
-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 1451882e35c..1027b2991c8 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -6,7 +6,7 @@
#
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
-e common/lib/capa
--e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail
+-e git+https://github.com/edx/codejail.git@17b45de7191f561e9a2c1b12c89489a8ba8e0758#egg=codejail
-e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki
-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
diff --git a/requirements/edx/github.in b/requirements/edx/github.in
index 3b029192cf1..df238415319 100644
--- a/requirements/edx/github.in
+++ b/requirements/edx/github.in
@@ -79,7 +79,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3
git+https://github.com/edx/bridgekeeper.git@4e34894e4ac5d0467ed1901811a81fd87ee01937#egg=bridgekeeper==0.0
# Our libraries:
--e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail
+-e git+https://github.com/edx/codejail.git@17b45de7191f561e9a2c1b12c89489a8ba8e0758#egg=codejail
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
git+https://github.com/edx/edx-ora2.git@2.4.7#egg=ora2==2.4.7
git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 6529fd0ebce..420c7ae43c6 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -6,7 +6,7 @@
#
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
-e common/lib/capa
--e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail
+-e git+https://github.com/edx/codejail.git@17b45de7191f561e9a2c1b12c89489a8ba8e0758#egg=codejail
-e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki
-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
--
GitLab