diff options
| author | Zach White <[email protected]> | 2021-05-19 15:49:11 -0700 | 
|---|---|---|
| committer | Zach White <[email protected]> | 2021-05-19 15:49:11 -0700 | 
| commit | 6955c5a00295382d3b4151a840aa5c929cd98059 (patch) | |
| tree | 26109c4ed2a266650fc5fad19ce5f784bc7c346b /lib/python/qmk/cli/pyformat.py | |
| parent | 82aa9ad4a567695d1f7d0b1e36bf8563d2967813 (diff) | |
| parent | db1eacdaacb9c8f6889f46bc1c6af155b81ad72a (diff) | |
| download | qmk_firmware-6955c5a00295382d3b4151a840aa5c929cd98059.tar.gz qmk_firmware-6955c5a00295382d3b4151a840aa5c929cd98059.zip | |
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
	lib/python/qmk/tests/test_cli_commands.py
	util/install/fedora.sh
Diffstat (limited to 'lib/python/qmk/cli/pyformat.py')
| -rwxr-xr-x | lib/python/qmk/cli/pyformat.py | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/lib/python/qmk/cli/pyformat.py b/lib/python/qmk/cli/pyformat.py index 02581f0d85..abe5f6de19 100755 --- a/lib/python/qmk/cli/pyformat.py +++ b/lib/python/qmk/cli/pyformat.py @@ -1,8 +1,8 @@  """Format python code according to QMK's style.  """ -from milc import cli +from subprocess import CalledProcessError, DEVNULL -import subprocess +from milc import cli  @cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Flag only, don't automatically format.") @@ -13,11 +13,11 @@ def pyformat(cli):      edit = '--diff' if cli.args.dry_run else '--in-place'      yapf_cmd = ['yapf', '-vv', '--recursive', edit, 'bin/qmk', 'lib/python']      try: -        cli.run(yapf_cmd, check=True, capture_output=False) +        cli.run(yapf_cmd, check=True, capture_output=False, stdin=DEVNULL)          cli.log.info('Python code in `bin/qmk` and `lib/python` is correctly formatted.')          return True -    except subprocess.CalledProcessError: +    except CalledProcessError:          if cli.args.dry_run:              cli.log.error('Python code in `bin/qmk` and `lib/python` incorrectly formatted!')          else: | 
