From 08231fb66f73b83a2b5a1acc2abef49ca3be3b4c Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Thu, 24 Jun 2021 11:21:42 +0200 Subject: don't clobber IDs if they exist If a field exists with the name of the `auto_id_field` it should be used as is without converting it to an AutoID. The auto ID functionality should only kick in if and ID field does not exist. --- jsonpath_rw/jsonpath.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'jsonpath_rw/jsonpath.py') 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: -- cgit v1.2.1