Issue #18347: ElementTree's html serializer now preserves the case of closing tags.

6597aa16 · Christian Heimes · 260fbe80 · 54ad7e39 · 6597aa16 · 6597aa16
Commit 6597aa16 authored Jul 05, 2013 by Christian Heimes
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 3 deletions

Lib/test/test_xml_etree.py Lib/test/test_xml_etree.py +7 -0

Lib/xml/etree/ElementTree.py Lib/xml/etree/ElementTree.py +3 -3

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -742,6 +742,13 @@ class ElementTreeTest(unittest.TestCase):
                '<html><link><script>1 < 2</script></html>\n')
        self.assertEqual(serialize(e, method="text"), '1 < 2\n')

+    def test_issue18347(self):
+        e = ET.XML('<html><CamelCase>text</CamelCase></html>')
+        self.assertEqual(serialize(e),
+                '<html><CamelCase>text</CamelCase></html>')
+        self.assertEqual(serialize(e, method="html"),
+                '<html><CamelCase>text</CamelCase></html>')
+
    def test_entity(self):
        # Test entity handling.


--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -992,15 +992,15 @@ def _serialize_html(write, elem, qnames, namespaces, **kwargs):
                    # FIXME: handle boolean attributes
                    write(" %s=\"%s\"" % (qnames[k], v))
            write(">")
-            tag = tag.lower()
+            ltag = tag.lower()
            if text:
-                if tag == "script" or tag == "style":
+                if ltag == "script" or ltag == "style":
                    write(text)
                else:
                    write(_escape_cdata(text))
            for e in elem:
                _serialize_html(write, e, qnames, None)
-            if tag not in HTML_EMPTY:
+            if ltag not in HTML_EMPTY:
                write("</" + tag + ">")
    if elem.tail:
        write(_escape_cdata(elem.tail))

--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -135,6 +135,9 @@ Core and Builtins
 Library
 -------

+- Issue #18347: ElementTree's html serializer now preserves the case of
+  closing tags.
+
 - Issue #17261: Ensure multiprocessing's proxies use proper address.

 - Issue #18343: faulthandler.register() now keeps the previous signal handler