diff --git a/glances/exports/glances_zeromq.py b/glances/exports/glances_zeromq.py index b8ee760b..30f18765 100644 --- a/glances/exports/glances_zeromq.py +++ b/glances/exports/glances_zeromq.py @@ -20,16 +20,15 @@ """ZeroMQ interface class.""" import sys -from datetime import datetime -import time import json import zmq from zmq.utils.strtypes import asbytes -from glances.compat import NoOptionError, NoSectionError, u, b, nativestr +from glances.compat import NoOptionError, NoSectionError, b from glances.logger import logger from glances.exports.glances_export import GlancesExport + class Export(GlancesExport): """This class manages the ZeroMQ export module.""" diff --git a/glances/main.py b/glances/main.py index 57a0ce77..0d222c43 100644 --- a/glances/main.py +++ b/glances/main.py @@ -25,7 +25,7 @@ import sys import tempfile from glances import __appname__, __version__, psutil_version -from glances.compat import input, NoOptionError, NoSectionError +from glances.compat import input from glances.config import Config from glances.globals import LINUX, WINDOWS from glances.logger import logger diff --git a/glances/plugins/glances_amps.py b/glances/plugins/glances_amps.py index 5a8583d5..87b4cd15 100644 --- a/glances/plugins/glances_amps.py +++ b/glances/plugins/glances_amps.py @@ -21,7 +21,6 @@ from glances.compat import iteritems from glances.amps_list import AmpsList as glancesAmpsList -from glances.logger import logger from glances.plugins.glances_plugin import GlancesPlugin diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py index 0413dea5..f541f590 100644 --- a/glances/plugins/glances_docker.py +++ b/glances/plugins/glances_docker.py @@ -477,10 +477,10 @@ class Plugin(GlancesPlugin): header=i['name'] + '_mem', action_key=i['name']) if alert == 'DEFAULT': - # Not found ? Get back to default MEM threasold value - alert = self.get_alert(i['memory']['usage'], - maximum=i['memory']['limit'], - header='mem') + # Not found ? Get back to default MEM threasold value + alert = self.get_alert(i['memory']['usage'], + maximum=i['memory']['limit'], + header='mem') self.views[i[self.get_key()]]['mem']['decoration'] = alert return True diff --git a/glances/plugins/glances_ip.py b/glances/plugins/glances_ip.py index c859b8b4..adb1224f 100644 --- a/glances/plugins/glances_ip.py +++ b/glances/plugins/glances_ip.py @@ -22,7 +22,7 @@ import threading from json import loads -from glances.compat import iterkeys, urlopen, URLError, queue +from glances.compat import iterkeys, urlopen, queue from glances.globals import BSD from glances.logger import logger from glances.timer import Timer diff --git a/glances/plugins/glances_ports.py b/glances/plugins/glances_ports.py index fedd044c..a4d002a0 100644 --- a/glances/plugins/glances_ports.py +++ b/glances/plugins/glances_ports.py @@ -23,7 +23,6 @@ import os import subprocess import threading import socket -import types import time from glances.globals import WINDOWS diff --git a/glances/plugins/glances_quicklook.py b/glances/plugins/glances_quicklook.py index 58efc746..f67813a3 100644 --- a/glances/plugins/glances_quicklook.py +++ b/glances/plugins/glances_quicklook.py @@ -22,7 +22,6 @@ from glances.cpu_percent import cpu_percent from glances.outputs.glances_bars import Bar from glances.plugins.glances_plugin import GlancesPlugin -from glances.logger import logger import psutil diff --git a/glances/plugins/glances_sensors.py b/glances/plugins/glances_sensors.py index cc8f993e..4566b02d 100644 --- a/glances/plugins/glances_sensors.py +++ b/glances/plugins/glances_sensors.py @@ -263,8 +263,8 @@ class GlancesGrabSensors(object): try: sensors_current['label'] = feature.label sensors_current['value'] = int(feature.get_value()) - except SensorsError as e: - logger.debug("Cannot grab sensor stat(%s)" % e) + except Exception as e: + logger.debug("Cannot grab sensor stat (%s)" % e) else: self.sensors_list.append(sensors_current) diff --git a/glances/processes.py b/glances/processes.py index 844c5bc5..4f7ad336 100644 --- a/glances/processes.py +++ b/glances/processes.py @@ -19,7 +19,6 @@ import operator import os -import re from glances.compat import iteritems, itervalues, listitems from glances.globals import BSD, LINUX, OSX, WINDOWS