Bugfix: correct handling of void elements without / in endtag

pelme · Jun 12, 2024 · be15515 · be15515
1 parent b59ea12
commit be15515
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/htpy/html2htpy.py b/htpy/html2htpy.py
@@ -9,6 +9,23 @@
 
 __all__ = ["html2htpy"]
 
+_void_elements = [
+    "area",
+    "base",
+    "br",
+    "col",
+    "embed",
+    "hr",
+    "img",
+    "input",
+    "link",
+    "meta",
+    "param",
+    "source",
+    "track",
+    "wbr",
+]
+
 
 class Tag:
     def __init__(
@@ -144,7 +161,8 @@ def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None
         else:
             self._current.children.append(t)
 
-        self._current = t
+        if tag not in _void_elements:
+            self._current = t
 
     def handle_startendtag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None:
         t = Tag(tag, attrs, parent=self._current)

diff --git a/tests/test_html2htpy.py b/tests/test_html2htpy.py
@@ -230,6 +230,23 @@ def test_convert_empty_elements() -> None:
     assert actual == "[div,p,span]"
 
 
+def test_convert_void_elements() -> None:
+    input = """
+      <div>
+        <div>
+          <input type="text" />
+        </div>
+
+        <div>
+          <input type="text">
+        </div>
+      </div>
+    """
+
+    actual = html2htpy(input)
+    assert actual == 'div[div[input(type="text")],div[input(type="text")]]'
+
+
 def test_convert_custom_tag() -> None:
     input = """
         <custom-element attribute="value">Custom content</custom-element>