diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-12-22 01:17:15 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-12-22 01:17:15 +0100 |
commit | 6c134311adf092e997bd1c4bd7b4d58ad9f2db91 (patch) | |
tree | a6f011cbb1b0d7ca79d2e18b75a8f34b6131a27b | |
parent | a330ae73631c57e374efb9c5cc41459b3c4818f8 (diff) | |
download | psutil-6c134311adf092e997bd1c4bd7b4d58ad9f2db91.tar.gz |
lscpu -J: option not supported on all Linuxes
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
-rwxr-xr-x | psutil/tests/test_linux.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index b41c4452..ba4a8907 100755 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -185,11 +185,11 @@ def vmstat(stat): def lscpu(field): - """A wrapper on top of "lscpu" CLI tool, parsing its output.""" - jdata = json.loads(sh("lscpu -J"))['lscpu'] - data = dict([(x['field'].lower().rstrip(':').strip(), x['data'].strip()) - for x in jdata]) - return data[field] + out = sh("lscpu") + for line in out.splitlines(): + key, _, value = line.partition(':') + if field.lower() == key.lower(): + return value def get_free_version_info(): |