diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-06-12 12:46:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 12:46:29 +0800 |
| commit | 4b2acfe192e3baf3a10701e132769650e3070f64 (patch) | |
| tree | 1470b39a70efaa2a6c7bf5de3937706e7362f259 | |
| parent | 6b994c625db2abaaadf58a0425f9daaf3e4ad9e5 (diff) | |
| download | psutil-4b2acfe192e3baf3a10701e132769650e3070f64.tar.gz | |
Revert "Add handling of missing space in meminfo output (#1517)" (#1531)
This reverts commit 6b994c625db2abaaadf58a0425f9daaf3e4ad9e5.
| -rw-r--r-- | psutil/_pslinux.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index 8f3ff7d6..e4bc7d75 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -386,9 +386,8 @@ def virtual_memory(): mems = {} with open_binary('%s/meminfo' % get_procfs_path()) as f: for line in f: - name, _, value = line.partition(':') - value_num, _, units = value.partition(' ') - mems[name + ':'] = int(value_num) * 1024 + fields = line.split() + mems[fields[0]] = int(fields[1]) * 1024 # /proc doc states that the available fields in /proc/meminfo vary # by architecture and compile options, but these 3 values are also |