提交 58ad1e7d 编写于 作者: D desbma 提交者: Alessio Sergi

Use operator.itemgetter instead of lambda when possible

上级 7cf0a319
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
# Import Python lib # Import Python lib
import collections import collections
import operator
import re import re
# Import psutil # Import psutil
...@@ -709,11 +710,11 @@ class GlancesProcesses(object): ...@@ -709,11 +710,11 @@ class GlancesProcesses(object):
process[sortedby][3], process[sortedby][3],
reverse=sortedreverse) reverse=sortedreverse)
except Exception: except Exception:
self.processlist.sort(key=lambda process: process['cpu_percent'], self.processlist.sort(key=operator.itemgetter('cpu_percent'),
reverse=sortedreverse) reverse=sortedreverse)
else: else:
# Others sorts # Others sorts
self.processlist.sort(key=lambda process: process[sortedby], self.processlist.sort(key=operator.itemgetter(sortedby),
reverse=sortedreverse) reverse=sortedreverse)
return self.processlist return self.processlist
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
"""Disk I/O plugin.""" """Disk I/O plugin."""
import operator
import psutil import psutil
# Import Glances libs # Import Glances libs
...@@ -134,7 +136,7 @@ class Plugin(GlancesPlugin): ...@@ -134,7 +136,7 @@ class Plugin(GlancesPlugin):
msg = '{0:>7}'.format(_("W/s")) msg = '{0:>7}'.format(_("W/s"))
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
# Disk list (sorted by name) # Disk list (sorted by name)
for i in sorted(self.stats, key=lambda diskio: diskio['disk_name']): for i in sorted(self.stats, key=operator.itemgetter('disk_name')):
# Do not display hidden interfaces # Do not display hidden interfaces
if self.is_hide(i['disk_name']): if self.is_hide(i['disk_name']):
continue continue
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
"""File system plugin.""" """File system plugin."""
import operator
import psutil import psutil
from glances.plugins.glances_plugin import GlancesPlugin from glances.plugins.glances_plugin import GlancesPlugin
...@@ -181,7 +183,7 @@ class Plugin(GlancesPlugin): ...@@ -181,7 +183,7 @@ class Plugin(GlancesPlugin):
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
# Disk list (sorted by name) # Disk list (sorted by name)
for i in sorted(self.stats, key=lambda fs: fs['mnt_point']): for i in sorted(self.stats, key=operator.itemgetter('mnt_point')):
# New line # New line
ret.append(self.curse_new_line()) ret.append(self.curse_new_line())
if i['device_name'] == '' or i['device_name'] == 'none': if i['device_name'] == '' or i['device_name'] == 'none':
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"""Network plugin.""" """Network plugin."""
import base64 import base64
import operator
import psutil import psutil
...@@ -223,7 +224,7 @@ class Plugin(GlancesPlugin): ...@@ -223,7 +224,7 @@ class Plugin(GlancesPlugin):
msg = '{0:>7}'.format(_("Tx/s")) msg = '{0:>7}'.format(_("Tx/s"))
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
# Interface list (sorted by name) # Interface list (sorted by name)
for i in sorted(self.stats, key=lambda network: network['interface_name']): for i in sorted(self.stats, key=operator.itemgetter('interface_name')):
# Do not display hidden interfaces # Do not display hidden interfaces
if self.is_hide(i['interface_name']): if self.is_hide(i['interface_name']):
continue continue
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"""Process list plugin.""" """Process list plugin."""
# Import sys libs # Import sys libs
import operator
import os import os
from datetime import timedelta from datetime import timedelta
...@@ -429,7 +430,7 @@ class Plugin(GlancesPlugin): ...@@ -429,7 +430,7 @@ class Plugin(GlancesPlugin):
process[sortedby][3], process[sortedby][3],
reverse=sortedreverse) reverse=sortedreverse)
except Exception: except Exception:
self.stats.sort(key=lambda process: process['cpu_percent'], self.stats.sort(key=operator.itemgetter('cpu_percent'),
reverse=sortedreverse) reverse=sortedreverse)
else: else:
# Others sorts # Others sorts
...@@ -437,10 +438,10 @@ class Plugin(GlancesPlugin): ...@@ -437,10 +438,10 @@ class Plugin(GlancesPlugin):
self.stats.set_sorting(sortedby, sortedreverse) self.stats.set_sorting(sortedby, sortedreverse)
else: else:
try: try:
self.stats.sort(key=lambda process: process[sortedby], self.stats.sort(key=operator.itemgetter(sortedby),
reverse=sortedreverse) reverse=sortedreverse)
except (KeyError, TypeError): except (KeyError, TypeError):
self.stats.sort(key=lambda process: process['name'], self.stats.sort(key=operator.itemgetter('name'),
reverse=False) reverse=False)
return self.stats return self.stats
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册