diff --git a/src/caoscrawler/macros/macro_yaml_object.py b/src/caoscrawler/macros/macro_yaml_object.py index 88637f39dc95b109aeabad9ac0f466478d3a80af..97fcef8cdf4b21a6906bd4cb6c0ddb89376e19f4 100644 --- a/src/caoscrawler/macros/macro_yaml_object.py +++ b/src/caoscrawler/macros/macro_yaml_object.py @@ -26,7 +26,7 @@ # A. Schlemmer, 05/2022 from dataclasses import dataclass -from typing import Any +from typing import Any, List, Dict from copy import deepcopy from string import Template @@ -39,11 +39,11 @@ class MacroDefinition: definition: A dictionary that will be substituted including parameters """ name: str - params: dict[str, Any] + params: Dict[str, Any] definition: Any # This dictionary stores the macro definitions -macro_store: dict[str, MacroDefinition] = dict() +macro_store: Dict[str, MacroDefinition] = dict() def substitute(propvalue, values: dict): @@ -55,14 +55,14 @@ def substitute(propvalue, values: dict): return propvalue_template.safe_substitute(**values) -def substitute_dict(sourced: dict[str, Any], values: dict[str, Any]): +def substitute_dict(sourced: Dict[str, Any], values: Dict[str, Any]): """ Create a copy of sourced. Afterwards recursively do variable substitution on all keys and values. """ d = deepcopy(sourced) # Changes in keys: - replace: dict[str, str] = dict() + replace: Dict[str, str] = dict() for k in d: replacement = substitute(k, values) if replacement != k: