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

Merge pull request #816 from edx/hotfix/xml-parsing

Browse Source 
Hotfix/xml parsing
This commit is contained in:
Adam
2013-08-28 09:52:48 -07:00
parent fbb6dc078f e88e04d3a6
commit 14708aa30b
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/lib/capa/capa/capa_problem.py
View File

@@ -555,6 +555,13 @@ class LoncapaProblem(object):
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')
and 'javascript' in problemtree.get('type')):
# leave javascript intact.

20
common/lib/capa/capa/tests/test_html_render.py
View File

@@ -226,6 +226,26 @@ class CapaHtmlRenderTest(unittest.TestCase):
span_element = rendered_html.find('span')
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):
test_fp = self.system.filestore.open(path, "w")
test_fp.write(content_str)