Skip to content

E
edx-platform
Commit 3194e544 by Ned Batchelder
Options

Merge pull request #805 from edx/ned/fix-allow-comments-in-capa-xml 

Keep comments in capa XML from causing failures
parents 77abfbf4 2c544cb0
Showing with 27 additions and 0 deletions
common/lib/capa/capa/capa_problem.py
...@@ -555,6 +555,13 @@ class LoncapaProblem(object): ...@@ -555,6 +555,13 @@ class LoncapaProblem(object):
Used by get_html. Used by get_html.
''' '''
if not isinstance(problemtree.tag, basestring):
# Comment and ProcessingInstruction nodes are not Elements,
# and we're ok leaving those behind.
# BTW: etree gives us no good way to distinguish these things
# other than to examine .tag to see if it's a string. :(
return
if (problemtree.tag == 'script' and problemtree.get('type') if (problemtree.tag == 'script' and problemtree.get('type')
and 'javascript' in problemtree.get('type')): and 'javascript' in problemtree.get('type')):
# leave javascript intact. # leave javascript intact.
......
common/lib/capa/capa/tests/test_html_render.py
...@@ -226,6 +226,26 @@ class CapaHtmlRenderTest(unittest.TestCase): ...@@ -226,6 +226,26 @@ class CapaHtmlRenderTest(unittest.TestCase):
span_element = rendered_html.find('span') span_element = rendered_html.find('span')
self.assertEqual(span_element.get('attr'), "TEST") self.assertEqual(span_element.get('attr'), "TEST")
def test_xml_comments_and_other_odd_things(self):
# Comments and processing instructions should be skipped.
xml_str = textwrap.dedent("""\
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html [
<!ENTITY % wacky "lxml.etree is wacky!">
]>
<problem>
<!-- A commment. -->
<?ignore this processing instruction. ?>
</problem>
""")
# Create the problem
problem = new_loncapa_problem(xml_str)
# Render the HTML
the_html = problem.get_html()
self.assertRegexpMatches(the_html, r"<div>\s+</div>")
def _create_test_file(self, path, content_str): def _create_test_file(self, path, content_str):
test_fp = self.system.filestore.open(path, "w") test_fp = self.system.filestore.open(path, "w")
test_fp.write(content_str) test_fp.write(content_str)
......
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