diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py index ef3554641a658004eced79931882aa182cdb48c2..ee327dde529327da0ef4810ee2819fc8ad7ab153 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 7a577dc8dc4eaa6458e28d9f40361be3d24f4eca..cc08b376b65f0fbe3b5fa1294b168ca0017fe611 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 1451882e35c9124f9fe8f2b1a122a4611a388d4d..1027b2991c835c00cab365d1d56c52f51c798876 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 3b029192cf186088f58cdd88a3f610984f4021eb..df2384153193e703637dd4f9f6de817c67df7e35 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 6529fd0ebce2c4df76ca74f9ce3d963fa79cc0e2..420c7ae43c63171c5614bc0a4e725c5fec36eeb0 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