poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make json imports more robust (#13928)

Browse source
This commit is contained in:
Zach White 2021-08-09 08:27:02 -07:00 committed by GitHub
parent 79d5b27993
commit 5eb0e406fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/python/qmk/json_schema.py
View file

@ -17,9 +17,12 @@ def json_load(json_file):
try: try:
return hjson.load(json_file.open(encoding='utf-8')) return hjson.load(json_file.open(encoding='utf-8'))
except json.decoder.JSONDecodeError as e: 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) cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
exit(1) exit(1)
except Exception as e:
cli.log.error('Unknown error attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
exit(1)
def load_jsonschema(schema_name): def load_jsonschema(schema_name):