Fix JSON cast for already parsed default configuration (#45)

* Fix JSON cast for already parsed default configuration * Add entry to CHANGES.txt
osantana · Jan 7, 2021 · 92ffacd · 92ffacd
1 parent 5fa7b48
commit 92ffacd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,8 @@
+2.2.1
+=====
+
+  - Fix JSON cast for already parsed default configuration
+
 2.2.0
 =====
 

diff --git a/prettyconf/casts.py b/prettyconf/casts.py
@@ -103,3 +103,5 @@ def __call__(self, value):
             return json.loads(value)
         except json.JSONDecodeError as ex:
             raise InvalidConfiguration('Invalid option {!r}'.format(value)) from ex
+        except TypeError:
+            return value
diff --git a/tests/test_casts.py b/tests/test_casts.py
@@ -111,6 +111,8 @@ def test_if_cast_is_unbounded():
     ('["obj1", "obj2"]', ['obj1', 'obj2']),
     ('{"key": "value"}', {'key': 'value'}),
     ('null', None),
+    (['already decoded object in default argument'],
+     ['already decoded object in default argument']),
 ])
 def test_basic_json_cast_values(value, result):
     json = JSON()
-Original file line number
+Diff line change
@@ -1,3 +1,8 @@
+.2.1
+    =====
+      - Fix JSON cast for already parsed default configuration
 .2.0
     =====
@@ Expand Down @@