drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source 
Conflicts:
	keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
This commit is contained in:
Zach White 2021-08-09 08:34:14 -07:00
commit 12681bacc4
35 changed files with 3370 additions and 18 deletions
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:
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)
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):