diff options
author | Zach White <skullydazed@gmail.com> | 2021-05-19 15:24:46 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-19 15:24:46 -0700 |
commit | db1eacdaacb9c8f6889f46bc1c6af155b81ad72a (patch) | |
tree | cd32a69a04c7ff93a11941d82aef3ce31c2b7523 /lib/python/qmk/os_helpers/__init__.py | |
parent | a9aec546c873fa5a2cb1d9a10878aca71818b609 (diff) | |
download | qmk_firmware-db1eacdaacb9c8f6889f46bc1c6af155b81ad72a.tar.gz qmk_firmware-db1eacdaacb9c8f6889f46bc1c6af155b81ad72a.zip |
Align our subprocess usage with current best practices. (#12940)
* Align our subprocess usage with current best practices.
* remove unused import
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* fix the cpp invocation for older python
* allow for unprompted installation
* make sure qmk new-keyboard works on windows
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'lib/python/qmk/os_helpers/__init__.py')
-rw-r--r-- | lib/python/qmk/os_helpers/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/python/qmk/os_helpers/__init__.py b/lib/python/qmk/os_helpers/__init__.py index 3f64a63a3..3e98db3c3 100644 --- a/lib/python/qmk/os_helpers/__init__.py +++ b/lib/python/qmk/os_helpers/__init__.py | |||
@@ -3,10 +3,9 @@ | |||
3 | from enum import Enum | 3 | from enum import Enum |
4 | import re | 4 | import re |
5 | import shutil | 5 | import shutil |
6 | import subprocess | 6 | from subprocess import DEVNULL |
7 | 7 | ||
8 | from milc import cli | 8 | from milc import cli |
9 | from qmk.commands import run | ||
10 | from qmk import submodules | 9 | from qmk import submodules |
11 | from qmk.constants import QMK_FIRMWARE | 10 | from qmk.constants import QMK_FIRMWARE |
12 | 11 | ||
@@ -142,7 +141,7 @@ def is_executable(command): | |||
142 | 141 | ||
143 | # Make sure the command can be executed | 142 | # Make sure the command can be executed |
144 | version_arg = ESSENTIAL_BINARIES[command].get('version_arg', '--version') | 143 | version_arg = ESSENTIAL_BINARIES[command].get('version_arg', '--version') |
145 | check = run([command, version_arg], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, timeout=5, universal_newlines=True) | 144 | check = cli.run([command, version_arg], combined_output=True, stdin=DEVNULL, timeout=5) |
146 | 145 | ||
147 | ESSENTIAL_BINARIES[command]['output'] = check.stdout | 146 | ESSENTIAL_BINARIES[command]['output'] = check.stdout |
148 | 147 | ||