diff options
| -rw-r--r-- | HISTORY.rst | 2 | ||||
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | psutil/__init__.py | 8 | ||||
| -rwxr-xr-x | scripts/sensors.py | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index ad931e77..cf09ae00 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,6 @@ *Bug tracker at https://github.com/giampaolo/psutil/issues* -*2017-02-07* +*2017-03-05* 5.2.0 ===== diff --git a/docs/index.rst b/docs/index.rst index 2f69480f..6ac90818 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -659,7 +659,7 @@ Sensors Return hardware fans speed. Each entry is a named tuple representing a certain hardware sensor fan. - Fan speed is expressed in RPM (round per minute). + Fan speed is expressed in RPM (rounds per minute). If sensors are not supported by the OS an empty dict is returned. Example:: diff --git a/psutil/__init__.py b/psutil/__init__.py index 0d4680e8..6b887761 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -2321,13 +2321,13 @@ def test(): # pragma: no cover today_day = datetime.date.today() templ = "%-10s %5s %4s %7s %7s %-13s %5s %7s %s" - attrs = ['pid', 'memory_percent', 'name', 'cpu_times', - 'create_time', 'memory_info'] + attrs = ['pid', 'memory_percent', 'name', 'cpu_times', 'create_time', + 'memory_info'] if POSIX: attrs.append('uids') attrs.append('terminal') - print(templ % ("USER", "PID", "%MEM", "VSZ", "RSS", "TTY", - "START", "TIME", "COMMAND")) + print(templ % ("USER", "PID", "%MEM", "VSZ", "RSS", "TTY", "START", "TIME", + "COMMAND")) for p in process_iter(): try: pinfo = p.as_dict(attrs, ad_value='') diff --git a/scripts/sensors.py b/scripts/sensors.py index 4c055efa..277ec215 100755 --- a/scripts/sensors.py +++ b/scripts/sensors.py @@ -11,17 +11,17 @@ A clone of 'sensors' utility on Linux printing hardware temperatures. $ python scripts/sensors.py asus Temperatures: - asus 57.0 °C (high=None °C, critical=None °C) + asus 57.0°C (high=None°C, critical=None°C) Fans: cpu_fan 3500 RPM acpitz Temperatures: - acpitz 57.0 °C (high=108.0 °C, critical=108.0 °C) + acpitz 57.0°C (high=108.0°C, critical=108.0°C) coretemp Temperatures: - Physical id 0 61.0 °C (high=87.0 °C, critical=105.0 °C) - Core 0 61.0 °C (high=87.0 °C, critical=105.0 °C) - Core 1 59.0 °C (high=87.0 °C, critical=105.0 °C) + Physical id 0 61.0°C (high=87.0°C, critical=105.0°C) + Core 0 61.0°C (high=87.0°C, critical=105.0°C) + Core 1 59.0°C (high=87.0°C, critical=105.0°C) Battery: charge: 84.95% status: charging @@ -64,7 +64,7 @@ def main(): if name in temps: print(" Temperatures:") for entry in temps[name]: - print(" %-20s %s °C (high=%s °C, critical=%s °C)" % ( + print(" %-20s %s°C (high=%s°C, critical=%s°C)" % ( entry.label or name, entry.current, entry.high, entry.critical)) # Fans. |