Skip to content

E
edx-platform
Commit 7e48de1e by Will Daly
Options

Reset responsetypes.py to version on master

parent 043d316d
Showing with 10 additions and 15 deletions
common/lib/capa/capa/responsetypes.py
...@@ -1048,24 +1048,19 @@ def sympy_check2(): ...@@ -1048,24 +1048,19 @@ def sympy_check2():
correct = ['correct'] * len(idset) if ret['ok'] else ['incorrect'] * len(idset) correct = ['correct'] * len(idset) if ret['ok'] else ['incorrect'] * len(idset)
msg = ret['msg'] msg = ret['msg']
def _cleanup_msg_html(msg_html): if 1:
cleaned = msg_html
# try to clean up message html # try to clean up message html
cleaned = '<html>' + cleaned + '</html>' msg = '<html>' + msg + '</html>'
cleaned = cleaned.replace('&#60;', '&lt;') msg = msg.replace('&#60;', '&lt;')
cleaned = etree.tostring(fromstring_bs(cleaned, convertEntities=None), #msg = msg.replace('&lt;','<')
msg = etree.tostring(fromstring_bs(msg, convertEntities=None),
pretty_print=True) pretty_print=True)
cleaned = cleaned.replace('&#13;', '') #msg = etree.tostring(fromstring_bs(msg),pretty_print=True)
cleaned = re.sub('(?ms)<html>(.*)</html>', '\\1', cleaned) msg = msg.replace('&#13;', '')
#msg = re.sub('<html>(.*)</html>','\\1',msg,flags=re.M|re.DOTALL) # python 2.7
return cleaned msg = re.sub('(?ms)<html>(.*)</html>', '\\1', msg)
if type(msg) == str: messages[0] = msg
messages[0] = _cleanup_msg_html(msg)
elif type(msg) == list:
for i in range(0, len(msg)):
messages[i] = _cleanup_msg_html(msg[i])
else: else:
correct = ['correct'] * len(idset) if ret else ['incorrect'] * len(idset) correct = ['correct'] * len(idset) if ret else ['incorrect'] * len(idset)
......
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