Commit 4e3ed8b5 by cahrens

Restore more specific error messages.

EDUCATOR-929
parent dfca1fa2
......@@ -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:
......
......@@ -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"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment