Merge 90295c4 into 5955d09

investigativedata · Jun 17, 2024 · 7505057 · 7505057
2 parents 5955d09 + 90295c4
commit 7505057
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 98 deletions.
diff --git a/anystore/mixins.py b/anystore/mixins.py
@@ -30,7 +30,7 @@ class JsonMixin:
 
     @classmethod
     def from_json_str(cls, data: str, **kwargs) -> Self:
-        loaded = clean_dict({**orjson.loads(data), **kwargs})
+        loaded = clean_dict({**orjson.loads(data), **clean_dict(kwargs)})
         return cls(**loaded)
 
     @classmethod
@@ -46,7 +46,7 @@ class YamlMixin:
 
     @classmethod
     def from_yaml_str(cls, data: str, **kwargs) -> Self:
-        loaded = clean_dict({**yaml.safe_load(data), **kwargs})
+        loaded = clean_dict({**yaml.safe_load(data), **clean_dict(kwargs)})
         return cls(**loaded)
 
     @classmethod