make json imports more robust (#13928)
This commit is contained in:
parent
79d5b27993
commit
5eb0e406fd
1 changed files with 4 additions and 1 deletions
|
@ -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):
|
||||
|
|
Loading…
Reference in a new issue