Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21804 from edx/BOM-613

Browse Source 
BOM-613
This commit is contained in:
Ayub
2019-10-01 10:41:31 +05:00
committed by GitHub
parent df066afdf7 a21604afdb
commit 2de3667c85
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/lib/capa/capa/tests/test_responsetypes.py
View File

@@ -5,6 +5,7 @@ Tests of responsetypes
from __future__ import absolute_import
import io
import json
import os
import random
@@ -1588,6 +1589,8 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-docstring
if text == "There was a problem with the staff answer to this problem.":
text = "TRANSLATED!"
return text
gettext = ugettext
problem.capa_system.i18n = FakeTranslations()
with self.assertRaisesRegexp(StudentInputError, "TRANSLATED!"):
@@ -2294,7 +2297,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-docstring
# Prove that we can import code from a zipfile passed down to us.
# Make a zipfile with one module in it with one function.
zipstring = StringIO()
zipstring = io.BytesIO()
zipf = zipfile.ZipFile(zipstring, "w")
zipf.writestr("my_helper.py", textwrap.dedent("""\
def seventeen():

2
common/lib/symmath/symmath/formula.py
View File

@@ -424,7 +424,7 @@ class formula(object):
# pre-process the presentation mathml before sending it to snuggletex to convert to content mathml
try:
xml = self.preprocess_pmathml(self.expr)
xml = self.preprocess_pmathml(self.expr).decode('utf-8')
except Exception as err: # pylint: disable=broad-except
log.warning('Err %s while preprocessing; expr=%s', err, self.expr)
return "<html>Error! Cannot process pmathml</html>"