diff options
| author | Kenn Knowles <kenn@kennknowles.com> | 2021-06-24 10:59:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 10:59:21 -0700 |
| commit | 6f5647bb3ad2395c20f0191fef07a1df51c9fed8 (patch) | |
| tree | 6c99504715ad60f36ea9edd3a926541cddfe7743 | |
| parent | b008a97c247cd0f309e85db98e37d0c14e8dc81c (diff) | |
| parent | 08231fb66f73b83a2b5a1acc2abef49ca3be3b4c (diff) | |
| download | jsonpath-rw-6f5647bb3ad2395c20f0191fef07a1df51c9fed8.tar.gz | |
| -rw-r--r-- | jsonpath_rw/jsonpath.py | 15 | ||||
| -rw-r--r-- | tests/test_jsonpath.py | 17 |
2 files changed, 22 insertions, 10 deletions
diff --git a/jsonpath_rw/jsonpath.py b/jsonpath_rw/jsonpath.py index c47653e..1d4ac4c 100644 --- a/jsonpath_rw/jsonpath.py +++ b/jsonpath_rw/jsonpath.py @@ -430,14 +430,13 @@ class Fields(JSONPath): self.fields = fields def get_field_datum(self, datum, field): - if field == auto_id_field: - return AutoIdForDatum(datum) - else: - try: - field_value = datum.value[field] # Do NOT use `val.get(field)` since that confuses None as a value and None due to `get` - return DatumInContext(value=field_value, path=Fields(field), context=datum) - except (TypeError, KeyError, AttributeError): - return None + try: + field_value = datum.value[field] # Do NOT use `val.get(field)` since that confuses None as a value and None due to `get` + return DatumInContext(value=field_value, path=Fields(field), context=datum) + except (TypeError, KeyError, AttributeError): + if field == auto_id_field: + return AutoIdForDatum(datum) + return None def reified_fields(self, datum): if '*' not in self.fields: diff --git a/tests/test_jsonpath.py b/tests/test_jsonpath.py index 33c0ea6..8f4ae3c 100644 --- a/tests/test_jsonpath.py +++ b/tests/test_jsonpath.py @@ -244,7 +244,7 @@ class TestJsonPath(unittest.TestCase): ('*.id', {'foo':{'id': 1}, 'baz': 2}, - set(['1', 'baz'])) ]) + set([1, 'baz'])) ]) def test_root_auto_id(self): jsonpath.auto_id_field = 'id' @@ -267,6 +267,19 @@ class TestJsonPath(unittest.TestCase): self.check_cases([('[0].id', [42], ['[0]']), ('[2].id', [34, 65, 29, 59], ['[2]'])]) + def test_nested_index_auto_id(self): + jsonpath.auto_id_field = "id" + data = { + "id": 1, + "b": {'id': 'bid', 'name': 'bob'}, + "m": [ + {'a': 'a1'}, {'a': 'a2', 'id': 'a2id'} + ] + } + self.check_cases([('m.[1].id', data, ['a2id']), + ('m.[1].$.b.id', data, ['bid']), + ('m.[0].id', data, ['1.m.[0]'])]) + def test_slice_auto_id(self): jsonpath.auto_id_field = "id" self.check_cases([ ('[*].id', [1, 2, 3], ['[0]', '[1]', '[2]']), @@ -277,7 +290,7 @@ class TestJsonPath(unittest.TestCase): self.check_cases([('foo.baz.id', {'foo': {'baz': 3}}, ['foo.baz']), ('foo.baz.id', {'foo': {'baz': [3]}}, ['foo.baz']), ('foo.baz.id', {'foo': {'id': 'bizzle', 'baz': 3}}, ['bizzle.baz']), - ('foo.baz.id', {'foo': {'baz': {'id': 'hi'}}}, ['foo.hi']), + ('foo.baz.id', {'foo': {'baz': {'id': 'hi'}}}, ['hi']), ('foo.baz.bizzle.id', {'foo': {'baz': {'bizzle': 5}}}, ['foo.baz.bizzle'])]) def test_descendants_auto_id(self): |