Skip to content

Commit

Permalink
pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
giampaolo committed Mar 5, 2017
1 parent 48d633f commit 6bfab5d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*Bug tracker at https://github.com/giampaolo/psutil/issues*

*2017-02-07*
*2017-03-05*

5.2.0
=====
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down
8 changes: 4 additions & 4 deletions psutil/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='')
Expand Down
12 changes: 6 additions & 6 deletions scripts/sensors.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
$ 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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 6bfab5d

Please sign in to comment.