Merge pull request Infinidat#54 from Infinidat/ayalas/issue-53

Fix DefaultMunch/DefaultFactoryMunch return value for get method (fixes Infinidat#53)
flare-ws · Oct 30, 2019 · 48a722d · 48a722d
2 parents 17636ee + e6117e7
commit 48a722d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ Changelog
 
 Next Version
 ------------
+* Fix return value of DefaultMunch and DefaultFactoryMunch's get method (fixes [#53](https://github.com/Infinidat/munch/issues/53))
 
 * Support ``fromYAML`` classmethod for all Munch subclasses (PR [#52](https://github.com/Infinidat/munch/pull/52) fixes [#34](https://github.com/Infinidat/munch/issues/34)
 

diff --git a/munch/__init__.py b/munch/__init__.py
@@ -238,10 +238,9 @@ def get(self, k, d=None):
         """
         D.get(k[,d]) -> D[k] if k in D, else d.  d defaults to None.
         """
-        try:
-            return self[k]
-        except KeyError:
+        if k not in self:
             return d
+        return self[k]
 
     def setdefault(self, k, d=None):
         """

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 import pytest
+import munch
 
 
 @pytest.fixture(name='yaml')
@@ -9,3 +10,12 @@ def yaml_module():
     except ImportError:
         pass
     pytest.skip("Module 'PyYAML' is required")
+
+
+@pytest.fixture(params=[munch.Munch, munch.AutoMunch, munch.DefaultMunch, munch.DefaultFactoryMunch])
+def munch_obj(request):
+    cls = request.param
+    args = tuple()
+    if cls == munch.DefaultFactoryMunch:
+        args = args + (lambda: None,)
+    return cls(*args, hello="world", number=5)
diff --git a/tests/test_munch.py b/tests/test_munch.py
@@ -533,3 +533,7 @@ def __getitem__(self, k):
     assert custom_munch.a == 42
     assert custom_munch.get('b') == 42
     assert custom_munch.copy() == Munch(a=42, b=42)
+
+
+def test_get_default_value(munch_obj):
+    assert munch_obj.get("fake_key", "default_value") == "default_value"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ Changelog @@
     Next Version
     ------------
+    * Fix return value of DefaultMunch and DefaultFactoryMunch's get method (fixes [#53](https://github.com/Infinidat/munch/issues/53))
     * Support ``fromYAML`` classmethod for all Munch subclasses (PR [#52](https://github.com/Infinidat/munch/pull/52) fixes [#34](https://github.com/Infinidat/munch/issues/34)
@@ Expand Down @@