restore python 3.9 compatibility

Author: FelixSchwarz

htmlcompare/compare.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: MIT
 
 from collections.abc import Sequence
+from typing import Optional
 
 from htmlcompare.compare_css import compare_css
 from htmlcompare.nodes import Comment, ConditionalComment, Document, Element, Node, TextNode
@@ -16,7 +17,7 @@
 def compare_html(
     expected_html: str,
     actual_html: str,
-    options: CompareOptions | None = None,
+    options: Optional[CompareOptions] = None,
 ) -> ComparisonResult:
     """
     Compare two HTML strings for equality.

htmlcompare/nodes.py

@@ -2,6 +2,7 @@
 
 from collections.abc import Sequence
 from dataclasses import dataclass, field
+from typing import Union
 
 
 __all__ = ['Node', 'Element', 'TextNode', 'Comment', 'ConditionalComment', 'Document']
@@ -74,4 +75,4 @@ def __eq__(self, other):
 
 
 # Type alias for any node type
-Node = Element | TextNode | Comment | ConditionalComment
+Node = Union[Element, TextNode, Comment, ConditionalComment]

htmlcompare/normalize.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: MIT
 
 import re
+from typing import Optional
 
 from htmlcompare.elements import is_block_element
 from htmlcompare.nodes import Comment, ConditionalComment, Document, Element, Node, TextNode
@@ -13,7 +14,7 @@
 _DEFAULT_OPTIONS = CompareOptions()
 
 
-def normalize_tree(doc: Document, options: CompareOptions | None = None) -> Document:
+def normalize_tree(doc: Document, options: Optional[CompareOptions] = None) -> Document:
     """
     Normalize a document tree for comparison.
 
@@ -74,7 +75,7 @@ def _normalize_children(
     return result
 
 
-def _normalize_node(node: Node, in_block_context: bool, options: CompareOptions) -> Node | None:
+def _normalize_node(node: Node, in_block_context: bool, options: CompareOptions) -> Optional[Node]:
     """
     Normalize a single node.
 
@@ -92,7 +93,7 @@ def _normalize_node(node: Node, in_block_context: bool, options: CompareOptions)
     return node
 
 
-def _normalize_text_node(node: TextNode, in_block_context: bool) -> TextNode | None:
+def _normalize_text_node(node: TextNode, in_block_context: bool) -> Optional[TextNode]:
     """
     Normalize a text node.
 
@@ -152,7 +153,7 @@ def _normalize_element(element: Element, options: CompareOptions) -> Element:
 def _normalize_conditional_comment(
     node: ConditionalComment,
     options: CompareOptions,
-) -> ConditionalComment | None:
+) -> Optional[ConditionalComment]:
     """
     Normalize a conditional comment.
 

htmlcompare/parser.py

@@ -3,6 +3,7 @@
 import re
 import xml.etree.ElementTree as ET
 from collections.abc import Sequence
+from typing import Optional, Union
 
 import html5lib
 
@@ -47,8 +48,8 @@ def _element_to_node(element) -> Element:
     return Element(tag=tag, attributes=attributes, children=children)
 
 
-def _convert_children(element) -> Sequence[Element | TextNode | Comment | ConditionalComment]:
-    children: list[Element | TextNode | Comment | ConditionalComment] = []
+def _convert_children(element) -> Sequence[Union[Element, TextNode, Comment, ConditionalComment]]:
+    children: list[Union[Element, TextNode, Comment, ConditionalComment]] = []
     if element.text:
         # leading text before any child elements
         children.append(TextNode(content=element.text))
@@ -75,7 +76,8 @@ def _is_comment(element) -> bool:
     return callable(element.tag) or element.tag == ET.Comment
 
 
-def _parse_conditional_comment(content: str) -> ConditionalComment | None:
+
+def _parse_conditional_comment(content: str) -> Optional[ConditionalComment]:
     """
     Parse an IE conditional comment if the content matches the pattern.
 

htmlcompare/tests/parser_test.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: MIT
 
+from typing import Optional
+
 from htmlcompare.nodes import Comment, ConditionalComment, Document, Element, TextNode
 from htmlcompare.parser import parse_html as parse_html2
 
@@ -238,7 +240,7 @@ def test_regular_comment_not_parsed_as_conditional():
     assert comment.content == ' just a regular comment '
 
 
-def _find_first_child_with_tag(element: Element, tag: str) -> Element | None:
+def _find_first_child_with_tag(element: Element, tag: str) -> Optional[Element]:
     for child in element.children:
         if isinstance(child, Element) and child.tag == tag:
             return child

htmlcompare/testutils.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: MIT
 
+from typing import Optional
+
 from htmlcompare.compare import compare_html
 from htmlcompare.options import CompareOptions
 from htmlcompare.result import ComparisonResult
@@ -12,8 +14,8 @@ def assert_same_html(
         expected_html: str,
         actual_html: str,
         verbose: bool = True,
-        message: str | None = None,
-        options: CompareOptions | None = None,
+        message: Optional[str] = None,
+        options: Optional[CompareOptions] = None,
     ) -> None:
     """Assert that two HTML strings are semantically equal."""
     result = compare_html(expected_html, actual_html, options)
@@ -34,7 +36,7 @@ def assert_same_html(
 def assert_different_html(
     expected_html: str,
     actual_html: str,
-    options: CompareOptions | None = None,
+    options: Optional[CompareOptions] = None,
 ) -> ComparisonResult:
     """Assert that two HTML strings are semantically different."""
     result = compare_html(expected_html, actual_html, options)