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

Restore more specific error messages.

Browse Source 
EDUCATOR-929
This commit is contained in:
cahrens
2017-07-18 15:21:00 -04:00
parent dfca1fa2fa
commit 4e3ed8b5c6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/lib/capa/capa/responsetypes.py
View File

@@ -1602,8 +1602,9 @@ class NumericalResponse(LoncapaResponse):
student_float = evaluator({}, {}, student_answer)
except UndefinedVariable as undef_var:
raise StudentInputError(
_(u"Answers can include numerals, operation signs, and a few specific characters, "
u"such as the constants e and i.")
_(u"You may not use variables ({bad_variables}) in numerical problems.").format(
bad_variables=undef_var.message,
)
)
except ValueError as val_err:
if 'factorial' in val_err.message:
@@ -3108,8 +3109,7 @@ class FormulaResponse(LoncapaResponse):
cgi.escape(answer)
)
raise StudentInputError(
_(u"Answers can include numerals, operation signs, and a few specific characters, "
u"such as the constants e and i.")
_("Invalid input: {bad_input} not permitted in answer.").format(bad_input=err.message)
)
except ValueError as err:
if 'factorial' in err.message:

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

@@ -1669,8 +1669,7 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-docstring
problem = self.build_problem(answer=4)
errors = [ # (exception raised, message to student)
(calc.UndefinedVariable("x"), "Answers can include numerals, operation signs, "
"and a few specific characters, such as the constants e and i."),
(calc.UndefinedVariable("x"), r"You may not use variables \(x\) in numerical problems"),
(ValueError("factorial() mess-up"), "Factorial function evaluated outside its domain"),
(ValueError(), "Could not interpret '.*' as a number"),
(pyparsing.ParseException("oopsie"), "Invalid math syntax"),