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

This commit is contained in:
QMK Bot 2021-03-27 15:56:21 +00:00
commit 0d1162f180

View file

@ -15,7 +15,7 @@ def json_load(json_file):
Note: file must be a Path object. Note: file must be a Path object.
""" """
try: try:
return hjson.load(json_file.open()) return hjson.load(json_file.open(encoding='utf-8'))
except json.decoder.JSONDecodeError as e: except json.decoder.JSONDecodeError 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)