diff options
| author | QMK Bot <hello@qmk.fm> | 2021-11-23 00:24:00 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-11-23 00:24:00 +0000 |
| commit | 69853175d00335d76ff57b3db46948acb7e33307 (patch) | |
| tree | 952d8dcb018e1e3c9467de3fd2227b0ad62d58a1 | |
| parent | 7746aefe94cc4cd492bfafdef73d95d073f0603b (diff) | |
| parent | dbc7b535178020063f80aaaabac3ca8ff9f6e8bb (diff) | |
| download | qmk_firmware-69853175d00335d76ff57b3db46948acb7e33307.tar.gz qmk_firmware-69853175d00335d76ff57b3db46948acb7e33307.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rwxr-xr-x | lib/python/qmk/cli/format/python.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/format/python.py b/lib/python/qmk/cli/format/python.py index 95868d18a0..47b5c45fd5 100755 --- a/lib/python/qmk/cli/format/python.py +++ b/lib/python/qmk/cli/format/python.py @@ -25,9 +25,8 @@ def yapf_run(files): def filter_files(files): """Yield only files to be formatted and skip the rest """ - for file in files: - if file and file.name.split('.')[-1] in py_file_suffixes: + if file and normpath(file).name.split('.')[-1] in py_file_suffixes: yield file else: cli.log.debug('Skipping file %s', file) @@ -53,12 +52,14 @@ def format_python(cli): cli.log.warning('Filenames passed with -a, only formatting: %s', ','.join(map(str, files))) elif cli.args.all_files: - files = py_dirs + git_ls_cmd = ['git', 'ls-files', *py_dirs] + git_ls = cli.run(git_ls_cmd, stdin=DEVNULL) + files = list(filter_files(git_ls.stdout.split('\n'))) else: git_diff_cmd = ['git', 'diff', '--name-only', cli.args.base_branch, *py_dirs] git_diff = cli.run(git_diff_cmd, stdin=DEVNULL) - files = list(filter(None, git_diff.stdout.split('\n'))) + files = list(filter_files(git_diff.stdout.split('\n'))) # Sanity check if not files: |