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

1 files changed, 3 insertions, 10 deletions

diff --git a/lib/python/qmk/cli/json2c.py b/lib/python/qmk/cli/json2c.py
index ae8248e6b7..2873a9bfd3 100755
--- a/lib/python/qmk/cli/json2c.py
+++ b/lib/python/qmk/cli/json2c.py
@@ -1,12 +1,11 @@
 """Generate a keymap.c from a configurator export.
 """
-import json
-
 from argcomplete.completers import FilesCompleter
 from milc import cli
 
 import qmk.keymap
 import qmk.path
+from qmk.commands import parse_configurator_json
 
 
 @cli.argument('-o', '--output', arg_only=True, type=qmk.path.normpath, help='File to write to')
@@ -19,14 +18,8 @@ def json2c(cli):
     This command uses the `qmk.keymap` module to generate a keymap.c from a configurator export. The generated keymap is written to stdout, or to a file if -o is provided.
     """
 
-    try:
-        # Parse the configurator from json file (or stdin)
-        user_keymap = json.load(cli.args.filename)
-
-    except json.decoder.JSONDecodeError as ex:
-        cli.log.error('The JSON input does not appear to be valid.')
-        cli.log.error(ex)
-        return False
+    # Parse the configurator from json file (or stdin)
+    user_keymap = parse_configurator_json(cli.args.filename)
 
     # Environment processing
     if cli.args.output and cli.args.output.name == '-':