diff --git a/glances/core/glances_client.py b/glances/core/glances_client.py
index ba4321607ee109960ed86979de95c36f60c33022..7fe14f1855a4f5c28d102a1d88d7e2a782b5d11c 100644
--- a/glances/core/glances_client.py
+++ b/glances/core/glances_client.py
@@ -35,10 +35,9 @@ except ImportError:
import httplib
# Import Glances libs
-from glances.core.glances_globals import version, logger
+from glances.core.glances_globals import logger, version
from glances.core.glances_stats import GlancesStatsClient
from glances.outputs.glances_curses import GlancesCursesClient
-from glances.core.glances_autodiscover import GlancesAutoDiscoverServer
class GlancesClientTransport(Transport):
diff --git a/glances/core/glances_client_browser.py b/glances/core/glances_client_browser.py
index c6edf74b9ddcb3e461e87382eda7cb6c942a45fc..5b0b2a1adcf3ddd587befeb51d19c71c87c4c858 100644
--- a/glances/core/glances_client_browser.py
+++ b/glances/core/glances_client_browser.py
@@ -31,8 +31,8 @@ except ImportError:
# Import Glances libs
from glances.core.glances_globals import logger
from glances.outputs.glances_curses import GlancesCursesBrowser
-from glances.core.glances_client import GlancesClientTransport, GlancesClient
from glances.core.glances_autodiscover import GlancesAutoDiscoverServer
+from glances.core.glances_client import GlancesClient, GlancesClientTransport
from glances.core.glances_staticlist import GlancesStaticServer
@@ -221,7 +221,6 @@ class GlancesClientBrowser(object):
key,
value)
-
def end(self):
"""End of the client browser session."""
self.screen.end()
diff --git a/glances/core/glances_config.py b/glances/core/glances_config.py
index 7dd900919b9f7f487936b7159075b1db5be6602a..d6aa07cd573fcfc7c836ee92de77acbedb5a22c8 100644
--- a/glances/core/glances_config.py
+++ b/glances/core/glances_config.py
@@ -37,9 +37,9 @@ from glances.core.glances_globals import (
is_mac,
is_py3,
is_windows,
+ logger,
sys_prefix,
- work_path,
- logger
+ work_path
)
diff --git a/glances/core/glances_logging.py b/glances/core/glances_logging.py
index 86dae96417b55e5b9651b3a3edb5a518a03a56a5..525e345b88246a44840430c6a1f17c8a7474a3aa 100644
--- a/glances/core/glances_logging.py
+++ b/glances/core/glances_logging.py
@@ -21,8 +21,8 @@
import logging
import logging.config
-import tempfile
import os
+import tempfile
# Define the logging configuration
LOGGING_CFG = {
@@ -70,6 +70,7 @@ LOGGING_CFG = {
}
}
+
def glancesLogger():
_logger = logging.getLogger()
try:
diff --git a/glances/core/glances_main.py b/glances/core/glances_main.py
index 178ed21f7d0dd39cc185a89de2abc4ac6444a09b..34ac984e13c407dd9c764651e3fdf06ed43bbaed 100644
--- a/glances/core/glances_main.py
+++ b/glances/core/glances_main.py
@@ -21,13 +21,13 @@
# Import system libs
import argparse
-import sys
import os
+import sys
import tempfile
# Import Glances libs
from glances.core.glances_config import Config
-from glances.core.glances_globals import appname, psutil_version, version, logger, is_windows
+from glances.core.glances_globals import appname, is_windows, logger, psutil_version, version
class GlancesMain(object):
diff --git a/glances/core/glances_processes.py b/glances/core/glances_processes.py
index e7a614b6b911700058637dbebda7fc096fd4a0ef..970a19450bca4e0617f0fa5d7c54aeb809caa9e6 100644
--- a/glances/core/glances_processes.py
+++ b/glances/core/glances_processes.py
@@ -17,15 +17,17 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see .
-# Import Glances lib
-from glances.core.glances_globals import is_linux, is_bsd, is_mac, is_windows, logger
-from glances.core.glances_timer import Timer, getTimeSinceLastUpdate
-
# Import Python lib
import collections
-import psutil
import re
+# Import psutil
+import psutil
+
+# Import Glances lib
+from glances.core.glances_globals import is_bsd, is_linux, is_mac, is_windows, logger
+from glances.core.glances_timer import getTimeSinceLastUpdate, Timer
+
class ProcessTreeNode(object):
diff --git a/glances/core/glances_server.py b/glances/core/glances_server.py
index 8c23e1f87ca15cd250b798cc92b3d44b48e3094b..f0e4bddb6961c363abbeadac1a36fa73ab9fc446 100644
--- a/glances/core/glances_server.py
+++ b/glances/core/glances_server.py
@@ -32,7 +32,7 @@ except ImportError: # Python 2
from SimpleXMLRPCServer import SimpleXMLRPCServer
# Import Glances libs
-from glances.core.glances_globals import version, logger
+from glances.core.glances_globals import logger, version
from glances.core.glances_stats import GlancesStatsServer
from glances.core.glances_timer import Timer
from glances.core.glances_autodiscover import GlancesAutoDiscoverClient
diff --git a/glances/core/glances_standalone.py b/glances/core/glances_standalone.py
index 089d23198778e443b1b0b84dc92074e625764d76..2951d6fd503971041c12a3dba6eeaca5fb3b4e11 100644
--- a/glances/core/glances_standalone.py
+++ b/glances/core/glances_standalone.py
@@ -20,10 +20,9 @@
"""Manage the Glances standalone session."""
# Import Glances libs
-from glances.core.glances_globals import logger
+from glances.core.glances_globals import glances_processes, is_windows, logger
from glances.core.glances_stats import GlancesStats
from glances.outputs.glances_curses import GlancesCursesStandalone
-from glances.core.glances_globals import glances_processes, is_windows
class GlancesStandalone(object):
diff --git a/glances/core/glances_staticlist.py b/glances/core/glances_staticlist.py
index bc95e38b389e30156834c1dbf9644e89aa2f16dc..1307513bace73bc29f7c6739fb49d38010c3e8fd 100644
--- a/glances/core/glances_staticlist.py
+++ b/glances/core/glances_staticlist.py
@@ -20,7 +20,7 @@
"""Manage the Glances server static list """
# System lib
-from socket import gethostbyname, gaierror
+from socket import gaierror, gethostbyname
# Import Glances libs
from glances.core.glances_globals import logger
@@ -67,7 +67,7 @@ class GlancesStaticServer(object):
logger.error("Can not get IP address for server %s (%s)" % (new_server['name'], e))
continue
new_server['key'] = new_server['name'] + ':' + new_server['port']
-
+
# Default status is 'UNKNOWN'
new_server['status'] = 'UNKNOWN'
diff --git a/glances/core/glances_stats.py b/glances/core/glances_stats.py
index fbce4c683c562b94f0d77fcee82e7d15375e12bf..a0db14328a489229b7db1dc49cdccbd7c7215b0f 100644
--- a/glances/core/glances_stats.py
+++ b/glances/core/glances_stats.py
@@ -21,10 +21,10 @@
import collections
import os
-import sys
import re
+import sys
-from glances.core.glances_globals import plugins_path, sys_path, logger
+from glances.core.glances_globals import logger, plugins_path, sys_path
# SNMP OID regexp pattern to short system name dict
oid_to_short_system_name = {'.*Linux.*': 'linux',
@@ -116,7 +116,7 @@ class GlancesStats(object):
if input_stats == {}:
# For standalone and server modes
# For each plugins, call the update method
- for p in self._plugins:
+ for p in self._plugins:
#Â logger.debug(_("Update %s stats") % p)
self._plugins[p].update()
else:
@@ -185,7 +185,7 @@ class GlancesStatsServer(GlancesStats):
ret = {}
for p in self._plugins:
ret[p] = self.all_stats[p]
- return ret
+ return ret
def getAllPlugins(self):
"""Return the plugins list."""
@@ -214,7 +214,7 @@ class GlancesStatsClient(GlancesStats):
# Add the plugin to the dictionary
# The key is the plugin name
# for example, the file glances_xxx.py
- # generate self._plugins_list["xxx"] = ...
+ # generate self._plugins_list["xxx"] = ...
logger.debug(_("Init %s plugin") % item)
self._plugins[item] = plugin.Plugin()
# Restoring system path
@@ -274,7 +274,7 @@ class GlancesStatsClientSNMP(GlancesStats):
if oid_system_name == '':
return short_system_name
-
+
# Find the short name in the oid_to_short_os_name dict
try:
iteritems = oid_to_short_system_name.iteritems()
@@ -288,7 +288,6 @@ class GlancesStatsClientSNMP(GlancesStats):
return short_system_name
-
def update(self):
"""Update the stats using SNMP."""
# For each plugins, call the update method
diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py
index da95af156f53ca30ea79a6ba0d3fddc5a1672b42..8fab4aea5170922d6106e399ece99cb09ecb7ed3 100644
--- a/glances/outputs/glances_bottle.py
+++ b/glances/outputs/glances_bottle.py
@@ -19,6 +19,7 @@
"""Web interface class."""
+import json
import os
import sys
@@ -32,7 +33,6 @@ except ImportError:
logger.critical('Bottle module not found. Glances cannot start in web server mode.')
print(_("Install it using pip: # pip install bottle"))
sys.exit(2)
-import json
class GlancesBottle(object):
@@ -147,9 +147,9 @@ class GlancesBottle(object):
self.stats.update()
try:
- plist = json.dumps(self.plugins_list)
+ plist = json.dumps(self.plugins_list)
except Exception as e:
- abort(404, "Can not get plugin list (%s)" % str(e))
+ abort(404, "Can not get plugin list (%s)" % str(e))
return plist
def _api_all(self):
diff --git a/glances/outputs/glances_colorconsole.py b/glances/outputs/glances_colorconsole.py
index 7a9c801895092cf5e3276cd9b734b864777eeeaa..9318e7cbfd5f49db68e8dc9df35565388189b669 100644
--- a/glances/outputs/glances_colorconsole.py
+++ b/glances/outputs/glances_colorconsole.py
@@ -21,8 +21,6 @@ import sys
import threading
import time
-from glances.core.glances_globals import logger
-
import msvcrt
try:
import colorconsole
diff --git a/glances/outputs/glances_csv.py b/glances/outputs/glances_csv.py
index 02ea9aa4f9afc7d1b180bf9b629ad1420c7ff184..b003b376e593aca6f56bd9224e3ca9cf76e5fc4b 100644
--- a/glances/outputs/glances_csv.py
+++ b/glances/outputs/glances_csv.py
@@ -20,12 +20,11 @@
"""CSV interface class."""
# Import sys libs
-import sys
import csv
+import sys
# Import Glances lib
-from glances.core.glances_globals import logger
-from glances.core.glances_globals import is_py3
+from glances.core.glances_globals import is_py3, logger
# List of stats enabled in the CSV output
csv_stats_list = ['cpu', 'load', 'mem', 'memswap']
diff --git a/glances/plugins/glances_alert.py b/glances/plugins/glances_alert.py
index 25eff22ae78870263c5cc92632ccfdf5a9a9b645..e984b5985a0d5a2917ba17648438356eedebe611 100644
--- a/glances/plugins/glances_alert.py
+++ b/glances/plugins/glances_alert.py
@@ -20,7 +20,6 @@
"""Alert plugin."""
# Import system lib
-import types
from datetime import datetime
# Import Glances libs
diff --git a/glances/plugins/glances_core.py b/glances/plugins/glances_core.py
index 7d9fb321236821ae8cff71970eba1c359a92650d..ffd4ef2feca12bd52e156cb158f343f53b02b938 100644
--- a/glances/plugins/glances_core.py
+++ b/glances/plugins/glances_core.py
@@ -19,10 +19,10 @@
"""CPU core plugin."""
-from glances.plugins.glances_plugin import GlancesPlugin
-
import psutil
+from glances.plugins.glances_plugin import GlancesPlugin
+
class Plugin(GlancesPlugin):
diff --git a/glances/plugins/glances_cpu.py b/glances/plugins/glances_cpu.py
index 0099cbc05ad9bc902411bd010ccedd61f7f5fb26..bea096bc97cf03b563a0cf2cc9e5256216c31211 100644
--- a/glances/plugins/glances_cpu.py
+++ b/glances/plugins/glances_cpu.py
@@ -19,10 +19,10 @@
"""CPU plugin."""
-from glances.plugins.glances_plugin import GlancesPlugin
-
import psutil
+from glances.plugins.glances_plugin import GlancesPlugin
+
# SNMP OID
# percentage of user CPU time: .1.3.6.1.4.1.2021.11.9.0
# percentages of system CPU time: .1.3.6.1.4.1.2021.11.10.0
@@ -101,7 +101,7 @@ class Plugin(GlancesPlugin):
# You can find the CPU utilization of windows system by querying the oid
# Give also the number of core (number of element in the table)
try:
- cpu_stats = self.set_stats_snmp(snmp_oid=snmp_oid[self.get_short_system_name()],
+ cpu_stats = self.set_stats_snmp(snmp_oid=snmp_oid[self.get_short_system_name()],
bulk=True)
except KeyError:
self.reset()
@@ -123,7 +123,7 @@ class Plugin(GlancesPlugin):
self.stats = self.set_stats_snmp(snmp_oid=snmp_oid[self.get_short_system_name()])
except KeyError:
self.stats = self.set_stats_snmp(snmp_oid=snmp_oid['default'])
-
+
if self.stats['idle'] == '':
self.reset()
return self.stats
@@ -171,7 +171,7 @@ class Plugin(GlancesPlugin):
msg = '{0:8}'.format(_("user:"))
ret.append(self.curse_add_line(msg))
msg = '{0:>6.1%}'.format(self.stats['user'] / 100)
- ret.append(self.curse_add_line(msg, self.get_alert_log(self.stats['user'], header="user")))
+ ret.append(self.curse_add_line(msg, self.get_alert_log(self.stats['user'], header="user")))
elif 'idle' in self.stats:
msg = '{0:8}'.format(_("idle:"))
ret.append(self.curse_add_line(msg))
diff --git a/glances/plugins/glances_diskio.py b/glances/plugins/glances_diskio.py
index 15759fe4ca0eefa49175737ac198635e5e9b8a25..fb9becb5969b054ae7614a14d990db796bef09c0 100644
--- a/glances/plugins/glances_diskio.py
+++ b/glances/plugins/glances_diskio.py
@@ -19,12 +19,12 @@
"""Disk I/O plugin."""
+import psutil
+
# Import Glances libs
from glances.core.glances_timer import getTimeSinceLastUpdate
from glances.plugins.glances_plugin import GlancesPlugin
-import psutil
-
# Define the history items list
# All items in this list will be historised if the --enable-history tag is set
# 'color' define the graph color in #RGB format
diff --git a/glances/plugins/glances_fs.py b/glances/plugins/glances_fs.py
index 8fea0c962764fb84ebd6458b8df39333d3389748..e90ca51377a4b27b082aeee0cb269c4eda8c3be6 100644
--- a/glances/plugins/glances_fs.py
+++ b/glances/plugins/glances_fs.py
@@ -19,12 +19,10 @@
"""File system plugin."""
-# Glances libs
-from glances.plugins.glances_plugin import GlancesPlugin
-
-# PSutil lib for local grab
import psutil
+from glances.plugins.glances_plugin import GlancesPlugin
+
# SNMP OID
# The snmpd.conf needs to be edited.
# Add the following to enable it on all disk
diff --git a/glances/plugins/glances_hddtemp.py b/glances/plugins/glances_hddtemp.py
index 7539b19c766e82731d4547cbf928befc4ce3b7b6..1492a25184d167033ab5d42cbd1ec2cd99dac163 100644
--- a/glances/plugins/glances_hddtemp.py
+++ b/glances/plugins/glances_hddtemp.py
@@ -20,7 +20,7 @@
"""HDD temperature plugin."""
# Import system libs
-import os.path
+import os
import socket
# Import Glances libs
diff --git a/glances/plugins/glances_load.py b/glances/plugins/glances_load.py
index 0808421c35376c5a127b39267f5e7a333d7b6805..c689173dabe08549d553e6dd75806c8cae8bef1b 100644
--- a/glances/plugins/glances_load.py
+++ b/glances/plugins/glances_load.py
@@ -23,7 +23,6 @@
import os
# Import Glances libs
-from glances.core.glances_globals import logger
from glances.plugins.glances_core import Plugin as CorePlugin
from glances.plugins.glances_plugin import GlancesPlugin
diff --git a/glances/plugins/glances_mem.py b/glances/plugins/glances_mem.py
index 2f7db9518a2bb37c3c1ba3638a67ba556c67ecd5..2c2eca4371c9cedecc1e01c4990cbfe12193bebd 100644
--- a/glances/plugins/glances_mem.py
+++ b/glances/plugins/glances_mem.py
@@ -19,10 +19,10 @@
"""Virtual memory plugin."""
-from glances.plugins.glances_plugin import GlancesPlugin
-
import psutil
+from glances.plugins.glances_plugin import GlancesPlugin
+
# SNMP OID
# Total RAM in machine: .1.3.6.1.4.1.2021.4.5.0
# Total RAM used: .1.3.6.1.4.1.2021.4.6.0
@@ -117,7 +117,7 @@ class Plugin(GlancesPlugin):
if self.get_short_system_name() in ('windows', 'esxi'):
# Mem stats for Windows|Vmware Esxi are stored in the FS table
try:
- fs_stat = self.set_stats_snmp(snmp_oid=snmp_oid[self.get_short_system_name()],
+ fs_stat = self.set_stats_snmp(snmp_oid=snmp_oid[self.get_short_system_name()],
bulk=True)
except KeyError:
self.reset()
@@ -129,7 +129,7 @@ class Plugin(GlancesPlugin):
self.stats['total'] = int(fs_stat[fs]['size']) * int(fs_stat[fs]['alloc_unit'])
self.stats['used'] = int(fs_stat[fs]['used']) * int(fs_stat[fs]['alloc_unit'])
self.stats['percent'] = float(self.stats['used'] * 100 / self.stats['total'])
- self.stats['free'] = self.stats['total'] - self.stats['used']
+ self.stats['free'] = self.stats['total'] - self.stats['used']
break
else:
# Default behavor for others OS
diff --git a/glances/plugins/glances_memswap.py b/glances/plugins/glances_memswap.py
index fd312dcbb5588166a99f02e163c6bb7d4c3e7ba8..2fcaa8c943129acd0f9db59b6009f7033f983a93 100644
--- a/glances/plugins/glances_memswap.py
+++ b/glances/plugins/glances_memswap.py
@@ -19,10 +19,10 @@
"""Swap memory plugin."""
-from glances.plugins.glances_plugin import GlancesPlugin
-
import psutil
+from glances.plugins.glances_plugin import GlancesPlugin
+
# SNMP OID
# Total Swap Size: .1.3.6.1.4.1.2021.4.3.0
# Available Swap Space: .1.3.6.1.4.1.2021.4.4.0
diff --git a/glances/plugins/glances_network.py b/glances/plugins/glances_network.py
index 0aac9bcfb9c7528720f4912522c60da1fba822f3..4a13a9a9eb640ae2102b2fcf512a39fb5108f705 100644
--- a/glances/plugins/glances_network.py
+++ b/glances/plugins/glances_network.py
@@ -21,11 +21,11 @@
import base64
+import psutil
+
from glances.core.glances_timer import getTimeSinceLastUpdate
from glances.plugins.glances_plugin import GlancesPlugin
-import psutil
-
# SNMP OID
# http://www.net-snmp.org/docs/mibs/interfaces.html
# Dict key = interface_name
diff --git a/glances/plugins/glances_percpu.py b/glances/plugins/glances_percpu.py
index c230eeb8dfac84ade29249b70629d7d0dc5d9e0a..b8a5dfc1ff2f6b86f954328e3e5d8f2bad40ae2e 100644
--- a/glances/plugins/glances_percpu.py
+++ b/glances/plugins/glances_percpu.py
@@ -19,12 +19,10 @@
"""Per-CPU plugin."""
-# Import Glances libs
-from glances.plugins.glances_plugin import GlancesPlugin
-
-# Check for psutil already done in the glances_core script
import psutil
+from glances.plugins.glances_plugin import GlancesPlugin
+
class Plugin(GlancesPlugin):
diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py
index bd611f6af91c1a383e81495a848af7c274fe9a18..9035672165f347e63d277c965a0a001347af2fd9 100644
--- a/glances/plugins/glances_plugin.py
+++ b/glances/plugins/glances_plugin.py
@@ -24,12 +24,12 @@ I am your father...
"""
# Import system libs
-from datetime import datetime
import json
+from datetime import datetime
from operator import itemgetter
# Import Glances lib
-from glances.core.glances_globals import is_py3, glances_logs, logger
+from glances.core.glances_globals import glances_logs, is_py3, logger
class GlancesPlugin(object):
diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py
index bd5cbbbf7c83ce82fb2f8fc768b33bca2c8b961a..3c9c9d671b82612a579ade862ab027a903a32d56 100644
--- a/glances/plugins/glances_processlist.py
+++ b/glances/plugins/glances_processlist.py
@@ -24,7 +24,7 @@ import os
from datetime import timedelta
# Import Glances libs
-from glances.core.glances_globals import glances_processes, is_linux, is_bsd, is_mac, is_windows, logger
+from glances.core.glances_globals import glances_processes, is_windows
from glances.plugins.glances_plugin import GlancesPlugin
diff --git a/glances/plugins/glances_psutilversion.py b/glances/plugins/glances_psutilversion.py
index dc872cd47a233792cedd702bc5b1a6080edf9344..9c54b8dfcbfbb80a5e6d35d2a94ad843b65709ce 100644
--- a/glances/plugins/glances_psutilversion.py
+++ b/glances/plugins/glances_psutilversion.py
@@ -17,10 +17,10 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see .
-from glances.plugins.glances_plugin import GlancesPlugin
-
from psutil import __version__ as __psutil_version
+from glances.plugins.glances_plugin import GlancesPlugin
+
class Plugin(GlancesPlugin):
diff --git a/glances/plugins/glances_uptime.py b/glances/plugins/glances_uptime.py
index c49023f4d8e6ec1cc0995bffa689dac181c2d484..63f6341e9a55bbc9dbb9c957442a3520427b7081 100644
--- a/glances/plugins/glances_uptime.py
+++ b/glances/plugins/glances_uptime.py
@@ -22,12 +22,12 @@
# Import system libs
from datetime import datetime, timedelta
+# Import psutil
+import psutil
+
# Import Glances libs
from glances.plugins.glances_plugin import GlancesPlugin
-# Check for psutil already done in the glances_core script
-import psutil
-
# SNMP OID
snmp_oid = {'_uptime': '1.3.6.1.2.1.1.3.0'}