Skip to content

E
edx-platform
Commit fe50f944 by Victor Shnayder
Options

Fix inline html bug. 

* problem was in trying to remove the outer <html> + </html> tags.
* cleaned up the stringify function to be less magical, and more
  obviously correct.

[Fix #35136297]
parent cbfc117e
Showing with 42 additions and 5 deletions
common/lib/xmodule/xmodule/stringify.py
...@@ -12,9 +12,17 @@ def stringify_children(node): ...@@ -12,9 +12,17 @@ def stringify_children(node):
fixed from fixed from
http://stackoverflow.com/questions/4624062/get-all-text-inside-a-tag-in-lxml http://stackoverflow.com/questions/4624062/get-all-text-inside-a-tag-in-lxml
''' '''
parts = ([node.text] + # Useful things to know:
list(chain(*([etree.tostring(c), c.tail]
for c in node.getchildren()) # node.tostring() -- generates xml for the node, including start
))) # and end tags. We'll use this for the children.
# node.text -- the text after the end of a start tag to the start
# of the first child
# node.tail -- the text after the end this tag to the start of the
# next element.
parts = [node.text]
for c in node.getchildren():
parts.append(etree.tostring(c, with_tail=True))
# filter removes possible Nones in texts and tails # filter removes possible Nones in texts and tails
return ''.join(filter(None, parts)) return ''.join(filter(None, parts))
common/lib/xmodule/xmodule/tests/test_stringify.py
from nose.tools import assert_equals from nose.tools import assert_equals, assert_true, assert_false
from lxml import etree from lxml import etree
from xmodule.stringify import stringify_children from xmodule.stringify import stringify_children
...@@ -8,3 +8,32 @@ def test_stringify(): ...@@ -8,3 +8,32 @@ def test_stringify():
xml = etree.fromstring(html) xml = etree.fromstring(html)
out = stringify_children(xml) out = stringify_children(xml)
assert_equals(out, text) assert_equals(out, text)
def test_stringify_again():
html = """<html name="Voltage Source Answer" >A voltage source is non-linear!
<div align="center">
<img src="/static/images/circuits/voltage-source.png"/>
\(V=V_C\)
</div>
But it is <a href="http://mathworld.wolfram.com/AffineFunction.html">affine</a>,
which means linear except for an offset.
</html>
"""
html = """<html>A voltage source is non-linear!
<div align="center">
</div>
But it is <a href="http://mathworld.wolfram.com/AffineFunction.html">affine</a>,
which means linear except for an offset.
</html>
"""
xml = etree.fromstring(html)
out = stringify_children(xml)
print "output:"
print out
# Tracking strange content repeating bug
# Should appear once
assert_equals(out.count("But it is "), 1)
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