Skip to content

E
edx-platform
Commit d6df7e2d by Will Daly
Options

Added comments to clean_message_html

parent f8893e9c
Showing with 18 additions and 4 deletions
common/lib/capa/capa/responsetypes.py
...@@ -1143,19 +1143,33 @@ def sympy_check2(): ...@@ -1143,19 +1143,33 @@ def sympy_check2():
return correct_map return correct_map
def clean_message_html(self, msg): def clean_message_html(self, msg):
# If *msg* is an empty string, then the code below
# will return "</html>". To avoid this, we first check
# that *msg* is a non-empty string.
if msg: if msg:
# try to clean up message html
# When we parse *msg* using etree, there needs to be a root
# element, so we wrap the *msg* text in <html> tags
msg = '<html>' + msg + '</html>' msg = '<html>' + msg + '</html>'
# Replace < characters
msg = msg.replace('&#60;', '&lt;') msg = msg.replace('&#60;', '&lt;')
#msg = msg.replace('&lt;','<')
# Use etree to prettify the HTML
msg = etree.tostring(fromstring_bs(msg, convertEntities=None), msg = etree.tostring(fromstring_bs(msg, convertEntities=None),
pretty_print=True) pretty_print=True)
#msg = etree.tostring(fromstring_bs(msg),pretty_print=True)
msg = msg.replace('&#13;', '') msg = msg.replace('&#13;', '')
#msg = re.sub('<html>(.*)</html>','\\1',msg,flags=re.M|re.DOTALL) # python 2.7
# Remove the <html> tags we introduced earlier, so we're
# left with just the prettified message markup
msg = re.sub('(?ms)<html>(.*)</html>', '\\1', msg) msg = re.sub('(?ms)<html>(.*)</html>', '\\1', msg)
# Strip leading and trailing whitespace
return msg.strip() return msg.strip()
# If we start with an empty string, then return an empty string
else: else:
return "" return ""
......
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