Merge pull request #11 from ctomkow/support_None_value

Support none value

Author: ctomkow

README.md

@@ -81,8 +81,8 @@ parser.find_key_value(data, 'chain', 'B')
 
     > Wildcard **'*'** can be used as key(s) to match any.
 
-`find_key_value(data: dict | list, key: str, value: str | int | float | bool) -> list`
+`find_key_value(data: dict | list, key: str, value: str | int | float | bool | NoneType) -> list`
 
 - Provide JSON data as a dictionary or a list, a key as a string,
-  and a value as a string, integer, float, or boolean.
+  and a value as a string, integer, float, boolean, or None.
 - Returns a list of set(s) that contain the key:value pair.

jsonparse/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

jsonparse/parser.py

@@ -146,7 +146,7 @@ def find_key_chain(self, data: Union[dict, list], keys: list) -> list:
     def find_key_value(self,
                        data: Union[dict, list],
                        key: str,
-                       value: Union[str, int, float, bool]) -> list:
+                       value: Union[str, int, float, bool, None]) -> list:
         """
         Search JSON data that consists of key:value pairs for all instances of
         provided key and value pair. The parent set that contains the key:value
@@ -254,14 +254,14 @@ def _stack_all_key_values_in_dict(self, key: str, elem: dict) -> list:
     def _stack_all_key_and_value_in_dict(
             self,
             key: str,
-            value: Union[str, int, float, bool],
+            value: Union[str, int, float, bool, None],
             elem: dict) -> bool:
 
         if type(elem) is not dict:
             raise TypeError
         elif type(key) is not str:
             raise TypeError
-        elif not isinstance(value, (str, int, float, bool)):
+        elif not isinstance(value, (str, int, float, bool, type(None))):
             raise TypeError
 
         if len(elem) <= 0:  # don't want an empty dict on the stack
@@ -394,14 +394,14 @@ def _valid_key_value_input(
             self,
             data: Union[dict, list],
             key: str,
-            value: Union[str, int, float, bool]) -> bool:
+            value: Union[str, int, float, bool, None]) -> bool:
 
         if not isinstance(data, (dict, list)):
             raise TypeError
         elif not isinstance(key, str):
             raise TypeError
         elif not key:  # if key is an empty string
             raise ValueError
-        elif not isinstance(value, (str, int, float, bool)):
+        elif not isinstance(value, (str, int, float, bool, type(None))):
             raise TypeError
         return True

tests/test_parser.py

@@ -70,7 +70,7 @@ def complex_json(self):
             {
                 "id": "0003",
                 "type": "donut",
-                "exists": True,
+                "exists": None,
                 "ppu": 7,
                 "batters":
                     {
@@ -226,3 +226,33 @@ def test_find_key_value_not_found(self, parser, complex_json):
         )
 
         assert result == []
+
+    def test_find_key_value_none(self, parser, complex_json):
+
+        result = parser.find_key_value(
+            complex_json,
+            "exists",
+            None
+        )
+
+        assert result == [{
+                "id": "0003",
+                "type": "donut",
+                "exists": None,
+                "ppu": 7,
+                "batters":
+                {
+                    "batter":
+                    [
+                        {"id": "1001", "type": "Lar"},
+                        {"id": "1002", "type": "Chocolate"}
+                    ]
+                },
+                "on_top_thing":
+                [
+                    {"id": "5001", "type": "None"},
+                    {"id": "5002", "type": "Glazed"},
+                    {"id": "5003", "type": "Chocolate"},
+                    {"id": "5004", "type": "Maple"}
+                ]
+            }]