Skip to content
Snippets Groups Projects
Commit 7a4935c0 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

FIX: correct dict in match_properties of DictElementConverter

parent 02340e8b
No related branches found
No related tags found
2 merge requests!217TST: Make NamedTemporaryFiles Windows-compatible,!199Match properties feature for DictElementConverter
Pipeline #57627 passed
...@@ -507,11 +507,14 @@ class Converter(object, metaclass=ABCMeta): ...@@ -507,11 +507,14 @@ class Converter(object, metaclass=ABCMeta):
matched_m_prop = None matched_m_prop = None
matched_m_prop_value = None matched_m_prop_value = None
for prop_key, prop_value in properties.items(): for prop_key, prop_value in properties.items():
m_prop = re.match(prop_def_key, prop_key) print("{} = {}".format(prop_key, prop_value))
# TODO: automatic conversion to str ok?
m_prop = re.match(prop_def_key, str(prop_key))
if m_prop is not None: if m_prop is not None:
match_counter += 1 match_counter += 1
matched_m_prop = m_prop matched_m_prop = m_prop
m_prop_value = re.match(prop_def_value, prop_value) # TODO: automatic conversion to str ok?
m_prop_value = re.match(prop_def_value, str(prop_value))
if m_prop_value is None: if m_prop_value is None:
return False return False
matched_m_prop_value = m_prop_value matched_m_prop_value = m_prop_value
...@@ -952,7 +955,7 @@ class DictElementConverter(Converter): ...@@ -952,7 +955,7 @@ class DictElementConverter(Converter):
raise RuntimeError("Element must be a DictElement.") raise RuntimeError("Element must be a DictElement.")
vardict = match_name_and_value(self.definition, element.name, element.value) vardict = match_name_and_value(self.definition, element.name, element.value)
if not self.match_properties(element.value.items(), vardict): if not self.match_properties(element.value, vardict):
return None return None
return vardict return vardict
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment