From 8af690d721c6ae40a83ef350e239b1a8cbd4a8d2 Mon Sep 17 00:00:00 2001 From: Hendrik Boeck Date: Sat, 29 Jun 2024 16:19:44 +0200 Subject: [PATCH] fix type errors --- src/parasite/object.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parasite/object.py b/src/parasite/object.py index 59c9a6e..772f5c1 100644 --- a/src/parasite/object.py +++ b/src/parasite/object.py @@ -386,16 +386,16 @@ def merge(self, other: Object) -> Object: if key in self._m_items: # if both src and dest are objects, merge them if isinstance(value, Object) and isinstance(self._m_items[key], Object): - self._m_items[key].merge(value) + self._m_items[key].merge(value) # type: ignore # if both src and dest are arrays, merge them elif isinstance(value, Variant) and isinstance(self._m_items[key], Variant): for variant in value._m_variants: - self._m_items[key].add_variant(variant) + self._m_items[key].add_variant(variant) # type: ignore # if dest is already a variant, add the value to it elif isinstance(self._m_items[key], Variant): - self._m_items[key].add_variant(value) + self._m_items[key].add_variant(value) # type: ignore # else, create a new variant and add both values else: