valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify by using list comprehensions

Browse Source
This commit is contained in:
Chris Rebert 2013-05-16 16:47:18 -07:00
parent 7772c97b8e
commit 678f059052
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/ps.py
View File

@ -100,9 +100,7 @@ def cpu_percent(interval=0.1, per_cpu=False):
salt '*' ps.cpu_percent
'''
if per_cpu:
result = []
for cpu_percent in psutil.cpu_percent(interval, True):
result.append(cpu_percent)
result = list(psutil.cpu_percent(interval, True))
else:
result = psutil.cpu_percent(interval)
return result
@ -122,9 +120,7 @@ def cpu_times(per_cpu=False):
salt '*' ps.cpu_times
'''
if per_cpu:
result = []
for cpu_times in psutil.cpu_times(True):
result.append(dict(cpu_times._asdict()))
result = [dict(cpu_times._asdict()) for cpu_times in psutil.cpu_times(True)]
else:
result = dict(psutil.cpu_times(per_cpu)._asdict())
return result
@ -188,9 +184,7 @@ def disk_partitions(all=False):
salt '*' ps.disk_partitions
'''
result = []
for partition in psutil.disk_partitions(all):
result.append(dict(partition._asdict()))
result = [dict(partition._asdict()) for partition in psutil.disk_partitions(all)]
return result