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

c90111f9 · Ezio Melotti · ab02db23 · c90111f9 · c90111f9 · c90111f9
Commit c90111f9 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
@@ -1851,6 +1851,26 @@ def check_issue10777():
    >>> ET.register_namespace('test10777', 'http://myuri/')
    """
+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
@@ -983,7 +983,7 @@ def _serialize_xml(write, elem, qnames, namespaces):
        write(_escape_cdata(elem.tail))
 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
@@ -120,6 +120,9 @@ Core and Builtins
 Library
 -------
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
 - Issue #15842: the SocketIO.{readable,writable,seekable} methods now
  raise ValueError when the file-like object is closed.  Patch by Alessandro
  Moura.