From 5e08a8b2f9258ae1f0aca7e3ad044b6360e07458 Mon Sep 17 00:00:00 2001 From: Asko Nõmm Date: Wed, 1 Jan 2025 18:34:09 +0200 Subject: Update Dompa dep and remove typing.Dict usage --- htmtl/attribute_parser.py | 6 +++--- htmtl/expression_parser.py | 6 +++--- htmtl/htmtl.py | 2 +- pyproject.toml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htmtl/attribute_parser.py b/htmtl/attribute_parser.py index fe52162..7511c8e 100644 --- a/htmtl/attribute_parser.py +++ b/htmtl/attribute_parser.py @@ -1,15 +1,15 @@ from abc import ABC, abstractmethod -from typing import Any, Dict, Optional +from typing import Any, Optional from dompa.nodes import Node from htmtl.expression_parser import ExpressionParser class AttributeParser(ABC): - __data: Dict[str, Any] + __data: dict[str, Any] __expression_parser: ExpressionParser - def __init__(self, data: Dict[str, Any], expression_parser: ExpressionParser) -> None: + def __init__(self, data: dict[str, Any], expression_parser: ExpressionParser) -> None: self.__data = data self.__expression_parser = expression_parser diff --git a/htmtl/expression_parser.py b/htmtl/expression_parser.py index c27b8f4..6d955d9 100644 --- a/htmtl/expression_parser.py +++ b/htmtl/expression_parser.py @@ -1,12 +1,12 @@ -from typing import Dict, Any +from typing import Any from .expression_modifier import ExpressionModifier class ExpressionParser: - __data: Dict[str, Any] + __data: dict[str, Any] __expression_modifiers: list[type[ExpressionModifier]] - def __init__(self, data: Dict[str, Any], expression_modifiers: list[type[ExpressionModifier]]) -> None: + def __init__(self, data: dict[str, Any], expression_modifiers: list[type[ExpressionModifier]]) -> None: self.__data = data self.__expression_modifiers = expression_modifiers diff --git a/htmtl/htmtl.py b/htmtl/htmtl.py index 1deecac..a865eaf 100644 --- a/htmtl/htmtl.py +++ b/htmtl/htmtl.py @@ -52,7 +52,7 @@ class Htmtl: for parser in self.__attribute_parsers: parser_instance = parser(self.__data, expression_parser) - self.__dom.update(parser_instance.traverse) + self.__dom.traverse(parser_instance.traverse) def html(self) -> str: self.__parse() diff --git a/pyproject.toml b/pyproject.toml index 2fb9d8b..440dc07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = [ { name = "Asko Nõmm", email = "asko@nmm.ee" } ] dependencies = [ - "dompa>0.4.1" + "dompa>0.6.1" ] classifiers = [ "Programming Language :: Python :: 3", -- cgit v1.2.3