summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2022-11-09 15:50:43 +0000
committerGitHub <noreply@github.com>2022-11-09 15:50:43 +0000
commitdc9162438d8b16c7534b82b6ead42d104f823ffb (patch)
tree8c01b503baa5e44a4500fde925dcbf28c27d53ae /lib
parent293dbfdeffaeafd341f5c3d838c54757b821579e (diff)
Reject json with duplicate keys? (#18108)
Diffstat (limited to 'lib')
-rw-r--r--lib/python/qmk/json_schema.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index 01175146b5..934e2f841f 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -10,7 +10,18 @@ import jsonschema
from milc import cli
-def json_load(json_file):
+def _dict_raise_on_duplicates(ordered_pairs):
+ """Reject duplicate keys."""
+ d = {}
+ for k, v in ordered_pairs:
+ if k in d:
+ raise ValueError("duplicate key: %r" % (k,))
+ else:
+ d[k] = v
+ return d
+
+
+def json_load(json_file, strict=True):
"""Load a json file from disk.
Note: file must be a Path object.
@@ -20,7 +31,7 @@ def json_load(json_file):
# Not necessary if the data is provided via stdin
if isinstance(json_file, Path):
json_file = json_file.open(encoding='utf-8')
- return hjson.load(json_file)
+ return hjson.load(json_file, object_pairs_hook=_dict_raise_on_duplicates if strict else None)
except (json.decoder.JSONDecodeError, hjson.HjsonDecodeError) as e:
cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)