greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix python3 (again)

pull/354/head
Alessio Sergi 2014-04-14 19:55:55 +02:00
parent 9a402d013b
commit f709b6ae4a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glances/outputs/glances_curses.py
View File

@ -104,7 +104,7 @@ class glancesCurses:
if self.hascolors:
# Colors text styles
self.no_color = curses.color_pair(1)
self.default_color = curses.color_pair(3) | A_BOLD
self.default_color = curses.color_pair(3) | A_BOLD
self.ifCAREFUL_color = curses.color_pair(4) | A_BOLD
self.ifWARNING_color = curses.color_pair(5) | A_BOLD
self.ifCRITICAL_color = curses.color_pair(2) | A_BOLD
@ -331,7 +331,7 @@ class glancesCurses:
stats_monitor = stats.get_plugin('monitor').get_stats_display(args=self.args)
self.display_plugin(stats_processcount)
self.display_plugin(stats_monitor)
self.display_plugin(stats_processlist,
self.display_plugin(stats_processlist,
max_y=(screen_y - self.get_stats_display_height(stats_alert) - 3))
self.display_plugin(stats_alert)
@ -346,13 +346,13 @@ class glancesCurses:
# Exit if:
# - the plugin_stats message is empty
# - the display tag = False
if ((plugin_stats['msgdict'] == [])
if ((plugin_stats['msgdict'] == [])
or (not plugin_stats['display'])):
# Display the next plugin at the current plugin position
try:
self.column_to_x[plugin_stats['column'] + 1] = self.column_to_x[plugin_stats['column']]
self.line_to_y[plugin_stats['line'] + 1] = self.line_to_y[plugin_stats['line']]
except Exception, e:
except Exception:
pass
# Exit
return 0

10
glances/plugins/glances_plugin.py
View File

@ -77,7 +77,7 @@ class GlancesPlugin(object):
# print "\t%s = %s" % (self.plugin_name + '_' + s, v)
try:
self.limits[self.plugin_name + '_' + s] = config.get_option(self.plugin_name, s)
except ValueError, e:
except ValueError:
self.limits[self.plugin_name + '_' + s] = config.get_raw_option(self.plugin_name, s).split(",")
def set_limits(self, input_limits):
@ -159,19 +159,19 @@ class GlancesPlugin(object):
if (header == ""):
try:
return self.limits[self.plugin_name + '_' + 'hide']
except Exception, e:
except Exception:
return []
else:
try:
return self.limits[self.plugin_name + '_' + header + '_' + 'hide']
except Exception, e:
return self.limits[self.plugin_name + '_' + header + '_' + 'hide']
except Exception:
return []
def is_hide(self, value, header=""):
"""
Return True if the value is in the hide configuration list
"""
return value in self.get_hide(header=header)
return value in self.get_hide(header=header)
def get_limit_careful(self, header=""):
if (header == ""):