diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-04-15 23:39:32 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-04-15 23:39:32 +0200 |
| commit | 940a5b29b6cd44df16c4404c1dc3f50da237ac42 (patch) | |
| tree | 4b978a0aaa45ac8377382af066c1312f332d737b | |
| parent | 6019ecb9d65cfb3bd0b6da6d8acc2340ff453655 (diff) | |
| parent | f884ef43fd4547080735565b5cd7f46faa5e2191 (diff) | |
| download | psutil-940a5b29b6cd44df16c4404c1dc3f50da237ac42.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | HISTORY.rst | 2 | ||||
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | psutil/__init__.py | 2 | ||||
| -rw-r--r-- | psutil/_pslinux.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index 4eed6b8e..b906066a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -13,7 +13,7 @@ XXXX-XX-XX 5.7.0 ===== -2020-12-18 +2020-02-18 **Enhancements** diff --git a/docs/index.rst b/docs/index.rst index 7233793f..55e1586d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -751,7 +751,7 @@ Sensors See also `fans.py`_ and `sensors.py`_ for an example application. - Availability: Linux, macOS + Availability: Linux .. versionadded:: 5.2.0 diff --git a/psutil/__init__.py b/psutil/__init__.py index 18fb1f13..46c4a20b 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -2260,7 +2260,7 @@ if hasattr(_psplatform, "sensors_temperatures"): __all__.append("sensors_temperatures") -# Linux, macOS +# Linux if hasattr(_psplatform, "sensors_fans"): def sensors_fans(): diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index 9e32f25e..4fb783d1 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -716,7 +716,7 @@ elif os.path.exists("/proc/cpuinfo"): with open_binary('%s/cpuinfo' % get_procfs_path()) as f: for line in f: if line.lower().startswith(b'cpu mhz'): - key, value = line.split(b'\t:', 1) + key, value = line.split(b':', 1) ret.append(_common.scpufreq(float(value), 0., 0.)) return ret |