chg: ruff - isort fixes

97 files changed, 279 insertions, 267 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 0a4594b3..5cdfc920 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 from datetime import datetime
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -27,7 +27,6 @@ sys.path.insert(0, os.path.abspath('..'))
 # WARNING: Do not move this import before the sys.path.insert() call.
 from glances import __version__
 
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
diff --git a/glances/__init__.py b/glances/__init__.py
index a8d3ce28..a96d0a06 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -11,11 +11,11 @@
 """Init the Glances software."""
 
 # Import system libs
-import tracemalloc
 import locale
 import platform
 import signal
 import sys
+import tracemalloc
 
 # Global name
 # Version should start and end with a numerical char
diff --git a/glances/actions.py b/glances/actions.py
index f61475cb..192749b2 100644
--- a/glances/actions.py
+++ b/glances/actions.py
@@ -10,8 +10,8 @@
 """Manage on alert actions."""
 
 from glances.logger import logger
-from glances.timer import Timer
 from glances.secure import secure_popen
+from glances.timer import Timer
 
 try:
     import chevron
diff --git a/glances/amps/amp.py b/glances/amps/amp.py
index 373d75a4..b34063af 100644
--- a/glances/amps/amp.py
+++ b/glances/amps/amp.py
@@ -23,8 +23,8 @@ If the *one_line* var is true then the AMP will be displayed in one line.
 """
 
 from glances.globals import u
-from glances.timer import Timer
 from glances.logger import logger
+from glances.timer import Timer
 
 
 class GlancesAmp(object):
diff --git a/glances/amps/default/__init__.py b/glances/amps/default/__init__.py
index 886f0c8a..444ce053 100644
--- a/glances/amps/default/__init__.py
+++ b/glances/amps/default/__init__.py
@@ -25,11 +25,11 @@ one_line=false
 command=foo status
 """
 
-from subprocess import check_output, STDOUT, CalledProcessError
+from subprocess import STDOUT, CalledProcessError, check_output
 
-from glances.globals import u, to_ascii
-from glances.logger import logger
 from glances.amps.amp import GlancesAmp
+from glances.globals import to_ascii, u
+from glances.logger import logger
 
 
 class Amp(GlancesAmp):
diff --git a/glances/amps/nginx/__init__.py b/glances/amps/nginx/__init__.py
index 770c4aca..e8ecb829 100644
--- a/glances/amps/nginx/__init__.py
+++ b/glances/amps/nginx/__init__.py
@@ -46,8 +46,8 @@ status_url=http://localhost/nginx_status
 
 import requests
 
-from glances.logger import logger
 from glances.amps.amp import GlancesAmp
+from glances.logger import logger
 
 
 class Amp(GlancesAmp):
diff --git a/glances/amps/systemd/__init__.py b/glances/amps/systemd/__init__.py
index 3df7a8ae..f1b8013f 100644
--- a/glances/amps/systemd/__init__.py
+++ b/glances/amps/systemd/__init__.py
@@ -35,11 +35,11 @@ one_line=true
 systemctl_cmd=/usr/bin/systemctl --plain
 """
 
-from subprocess import check_output, CalledProcessError
+from subprocess import CalledProcessError, check_output
 
-from glances.logger import logger
-from glances.globals import iteritems, to_ascii
 from glances.amps.amp import GlancesAmp
+from glances.globals import iteritems, to_ascii
+from glances.logger import logger
 
 
 class Amp(GlancesAmp):
diff --git a/glances/amps/systemv/__init__.py b/glances/amps/systemv/__init__.py
index 78df6795..ce5676a1 100644
--- a/glances/amps/systemv/__init__.py
+++ b/glances/amps/systemv/__init__.py
@@ -34,11 +34,11 @@ one_line=true
 service_cmd=/usr/bin/service --status-all
 """
 
-from subprocess import check_output, STDOUT
+from subprocess import STDOUT, check_output
 
-from glances.logger import logger
-from glances.globals import iteritems
 from glances.amps.amp import GlancesAmp
+from glances.globals import iteritems
+from glances.logger import logger
 
 
 class Amp(GlancesAmp):
diff --git a/glances/amps_list.py b/glances/amps_list.py
index 5e8c3c13..9feccb5f 100644
--- a/glances/amps_list.py
+++ b/glances/amps_list.py
@@ -13,7 +13,7 @@ import os
 import re
 import threading
 
-from glances.globals import listkeys, iteritems, amps_path
+from glances.globals import amps_path, iteritems, listkeys
 from glances.logger import logger
 from glances.processes import glances_processes
 
diff --git a/glances/autodiscover.py b/glances/autodiscover.py
index f4b0e21a..336af140 100644
--- a/glances/autodiscover.py
+++ b/glances/autodiscover.py
@@ -16,7 +16,8 @@ from glances.globals import BSD
 from glances.logger import logger
 
 try:
-    from zeroconf import __version__ as __zeroconf_version, ServiceBrowser, ServiceInfo, Zeroconf
+    from zeroconf import ServiceBrowser, ServiceInfo, Zeroconf
+    from zeroconf import __version__ as __zeroconf_version
 
     zeroconf_tag = True
 except ImportError:
diff --git a/glances/client.py b/glances/client.py
index 6b8d4033..1412d1e1 100644
--- a/glances/client.py
+++ b/glances/client.py
@@ -9,16 +9,17 @@
 
 """Manage the Glances client."""
 
-import ujson
 import socket
 import sys
 import time
 
+import ujson
+
 from glances import __version__
 from glances.globals import Fault, ProtocolError, ServerProxy, Transport
 from glances.logger import logger
-from glances.stats_client import GlancesStatsClient
 from glances.outputs.glances_curses import GlancesCursesClient
+from glances.stats_client import GlancesStatsClient
 from glances.timer import Counter
 
 
diff --git a/glances/client_browser.py b/glances/client_browser.py
index 7513664e..c8ba9a8a 100644
--- a/glances/client_browser.py
+++ b/glances/client_browser.py
@@ -9,17 +9,18 @@
 
 """Manage the Glances client browser (list of Glances server)."""
 
-import ujson
 import socket
 import threading
 
-from glances.globals import Fault, ProtocolError, ServerProxy
+import ujson
+
+from glances.autodiscover import GlancesAutoDiscoverServer
 from glances.client import GlancesClient, GlancesClientTransport
-from glances.logger import logger, LOG_FILENAME
+from glances.globals import Fault, ProtocolError, ServerProxy
+from glances.logger import LOG_FILENAME, logger
+from glances.outputs.glances_curses_browser import GlancesCursesBrowser
 from glances.password_list import GlancesPasswordList as GlancesPassword
 from glances.static_list import GlancesStaticServer
-from glances.autodiscover import GlancesAutoDiscoverServer
-from glances.outputs.glances_curses_browser import GlancesCursesBrowser
 
 
 class GlancesClientBrowser(object):
diff --git a/glances/config.py b/glances/config.py
index abd1f5c1..8f263296 100644
--- a/glances/config.py
+++ b/glances/config.py
@@ -9,13 +9,13 @@
 
 """Manage the configuration file."""
 
+import multiprocessing
 import os
+import re
 import sys
-import multiprocessing
 from io import open
-import re
 
-from glances.globals import ConfigParser, NoOptionError, NoSectionError, system_exec, BSD, LINUX, MACOS, SUNOS, WINDOWS
+from glances.globals import BSD, LINUX, MACOS, SUNOS, WINDOWS, ConfigParser, NoOptionError, NoSectionError, system_exec
 from glances.logger import logger
 
 
diff --git a/glances/cpu_percent.py b/glances/cpu_percent.py
index 78950d0a..f978f863 100644
--- a/glances/cpu_percent.py
+++ b/glances/cpu_percent.py
@@ -9,11 +9,11 @@
 
 """CPU percent stats shared between CPU and Quicklook plugins."""
 
+import psutil
+
 from glances.logger import logger
 from glances.tim