summaryrefslogtreecommitdiff
path: root/psutil/_pslinux.py
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-02-09 21:29:35 +0100
committerGitHub <noreply@github.com>2020-02-09 21:29:35 +0100
commit796b2dda2e0d8751eee0a4d16ab8c027839f8908 (patch)
tree04c466dc50a84ca880b5c344634c6b8eef750541 /psutil/_pslinux.py
parent13cf7d7ab356233c3bb8dc34f1143e7bb0c2c088 (diff)
downloadpsutil-796b2dda2e0d8751eee0a4d16ab8c027839f8908.tar.gz
[Linux] disk_io_counters() ValueError when parsing /sys/block (#1684)
Fixes: ``` ====================================================================== ERROR: psutil.tests.test_linux.TestSystemDiskIoCounters.test_emulate_use_sysfs ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/giampaolo/svn/psutil/psutil/tests/test_linux.py", line 1195, in test_emulate_use_sysfs wsysfs = psutil.disk_io_counters(perdisk=True) File "/home/giampaolo/svn/psutil/psutil/__init__.py", line 2065, in disk_io_counters rawdict = _psplatform.disk_io_counters(**kwargs) File "/home/giampaolo/svn/psutil/psutil/_pslinux.py", line 1124, in disk_io_counters for entry in gen: File "/home/giampaolo/svn/psutil/psutil/_pslinux.py", line 1110, in read_sysfs wbytes, wtime, _, busy_time, _) = map(int, fields) ValueError: too many values to unpack (expected 11) ```
Diffstat (limited to 'psutil/_pslinux.py')
-rw-r--r--psutil/_pslinux.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
index 7348b3dc..ba65aea9 100644
--- a/psutil/_pslinux.py
+++ b/psutil/_pslinux.py
@@ -1106,7 +1106,7 @@ def disk_io_counters(perdisk=False):
fields = f.read().strip().split()
name = os.path.basename(root)
(reads, reads_merged, rbytes, rtime, writes, writes_merged,
- wbytes, wtime, _, busy_time, _) = map(int, fields)
+ wbytes, wtime, _, busy_time) = map(int, fields[:10])
yield (name, reads, writes, rbytes, wbytes, rtime,
wtime, reads_merged, writes_merged, busy_time)