From b0eed6d9adbf681e7e5797c20d2a7ee33b5d840b Mon Sep 17 00:00:00 2001 From: florian <f.spreckelsen@inidscale.com> Date: Tue, 4 Oct 2022 13:18:45 +0200 Subject: [PATCH] FIX: Make type checks compatible to Python3.8 --- src/caoscrawler/macros/macro_yaml_object.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/caoscrawler/macros/macro_yaml_object.py b/src/caoscrawler/macros/macro_yaml_object.py index 072c49b3..2849986e 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, Dict from copy import deepcopy from string import Template @@ -40,12 +40,12 @@ 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): @@ -57,14 +57,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: -- GitLab