Merge pull request #8 from dschenck/0.2.4

0.2.4

Author: dschenck

docs/contents/changelog.rst

@@ -2,6 +2,10 @@ Changelog
 =====================================
 The source code is hosted and maintained on `github <https://github.com/dschenck/easytree/>`_.
 
+Version 0.2.4 (2023-11-25)
+--------------------------
+    - fixed a bug where :code:`dict.setdefault` would never set the default value
+
 Version 0.2.3 (2023-09-14)
 --------------------------
     - maintain backward compatability with Python 3.6 and 3.7

easytree/__init__.py

@@ -1,3 +1,6 @@
+# metadata
+__version__ = "0.2.4"
+
 from easytree.tree import (
     Node,
     serialize,

easytree/types.py

@@ -570,16 +570,15 @@ def setdefault(self, key, default):
         AttributeError
             if the dict is frozen, or if the dict is sealed and the key does not exist in the dict
         """
-        try:
-            return self[key]
-        except KeyError:
+        if key not in self:
             if self._frozen:
                 raise AttributeError(f"Cannot set {key} on frozen easytree.dict")
             if self._sealed and key not in self:
                 raise AttributeError(f"Cannot set {key} on sealed easytree.dict")
-        return super().setdefault(
-            key, cast(default, sealed=self._sealed, frozen=self._frozen)
-        )
+            return super().setdefault(
+                key, cast(default, sealed=self._sealed, frozen=self._frozen)
+            )
+        return self[key]
 
     def get(self, key, default=None):
         """

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="easytree",
-    version="0.2.3",
+    version="0.2.4",
     author="David Schenck",
     author_email="david.schenck@outlook.com",
     description="A recursive dot-styled defaultdict to read and write deeply-nested trees",

tests/types.py

@@ -799,3 +799,26 @@ def test_undefined_race_conditions():
     b = x.y
 
     assert x == {}
+
+
+def test_dict_setdefault():
+    x = easytree.dict()
+    x.a.b.setdefault("c", "this should be set")
+    assert x == {"a": {"b": {"c": "this should be set"}}}
+
+    x.a.b.setdefault("c", "this should not be overriden")
+    assert x == {"a": {"b": {"c": "this should be set"}}}
+
+
+def test_dict_setdefault_on_frozen():
+    x = easytree.dict(frozen=True)
+
+    with pytest.raises(Exception):
+        x.a.b.setdefault("c", "this should raise an error")
+
+
+def test_dict_setdefault_on_sealed():
+    x = easytree.dict(sealed=True)
+
+    with pytest.raises(Exception):
+        x.a.b.setdefault("c", "this should raise an error")