#15970: xml.etree.ElementTree now serializes correctly the empty HTML elements "meta" and "param".

6d6fb3aa · Ezio Melotti · ba372a59 · 6d6fb3aa · 6d6fb3aa · 6d6fb3aa
Commit 6d6fb3aa authored Sep 19, 2012 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 1 deletion

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

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

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1822,6 +1822,26 @@ def check_issue6565():

    """

+def check_html_empty_elems_serialization(self):
+    # issue 15970
+    # from http://www.w3.org/TR/html401/index/elements.html
+    """
+
+    >>> empty_elems = ['AREA', 'BASE', 'BASEFONT', 'BR', 'COL', 'FRAME', 'HR',
+    ...                'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM']
+    >>> elems = ''.join('<%s />' % elem for elem in empty_elems)
+    >>> serialize(ET.XML('<html>%s</html>' % elems), method='html')
+    '<html><AREA><BASE><BASEFONT><BR><COL><FRAME><HR><IMG><INPUT><ISINDEX><LINK><META><PARAM></html>'
+    >>> serialize(ET.XML('<html>%s</html>' % elems.lower()), method='html')
+    '<html><area><base><basefont><br><col><frame><hr><img><input><isindex><link><meta><param></html>'
+    >>> elems = ''.join('<%s></%s>' % (elem, elem) for elem in empty_elems)
+    >>> serialize(ET.XML('<html>%s</html>' % elems), method='html')
+    '<html><AREA><BASE><BASEFONT><BR><COL><FRAME><HR><IMG><INPUT><ISINDEX><LINK><META><PARAM></html>'
+    >>> serialize(ET.XML('<html>%s</html>' % elems.lower()), method='html')
+    '<html><area><base><basefont><br><col><frame><hr><img><input><isindex><link><meta><param></html>'
+
+    """
+
 # --------------------------------------------------------------------



--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -945,7 +945,7 @@ def _serialize_xml(write, elem, encoding, qnames, namespaces):
        write(_escape_cdata(elem.tail, encoding))

 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
-              "img", "input", "isindex", "link", "meta" "param")
+              "img", "input", "isindex", "link", "meta", "param")

 try:
    HTML_EMPTY = set(HTML_EMPTY)

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

+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
 - Issue #15676: Now "mmap" check for empty files before doing the
  offset check.  Patch by Steven Willis.