Luke Plant avatar Luke Plant committed c049127

Switched from ElementTree to lxml

Comments (0)

Files changed (2)

semanticeditor/tests.py

         super(TestCase, self).tearDown()
 
     def test_empty(self):
-        self.assertEqual('<div class="row" />', format_html('', {}));
+        self.assertEqual('<div class="row"/>', format_html('', {}));
 
     def test_no_headings(self):
         html = '<p>Test</p>'

semanticeditor/utils/presentation.py

 Utilities for manipulating the content provided by the user.
 """
 
-from elementtree import ElementTree as ET
+from lxml import etree as ET
 from semanticeditor.utils.etree import cleanup, flatten, get_parent, get_depth, get_index, wrap_elements_in_tag, indent
 from semanticeditor.utils.datastructures import struct
 from xml.parsers import expat
 def parse(content):
     try:
         tree = ET.fromstring("<html>" + fixentities(content) + "</html>")
-    except expat.ExpatError, e:
+    except ET.XMLSyntaxError, e:
         raise InvalidHtml("HTML content is not well formed.")
     return tree
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.