summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com>2024-05-17 03:05:33 +0530
committerBharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com>2024-05-17 03:37:22 +0530
commit108ffcdfb637e288479f49ec083f601a1e88f51c (patch)
treec3483200a43d20c5432804326b7ff08a16e64bd8
parentf9a06a31f063ce0db66ba54a1d576b4c0ea94466 (diff)
chg: ruff - pyupgrade
-rw-r--r--docs/conf.py1
-rw-r--r--glances/__init__.py33
-rw-r--r--glances/__main__.py1
-rw-r--r--glances/actions.py9
-rw-r--r--glances/amps/amp.py18
-rw-r--r--glances/amps/default/__init__.py5
-rw-r--r--glances/amps/nginx/__init__.py1
-rw-r--r--glances/amps/systemd/__init__.py5
-rw-r--r--glances/amps/systemv/__init__.py5
-rw-r--r--glances/amps_list.py13
-rw-r--r--glances/attribute.py3
-rw-r--r--glances/autodiscover.py43
-rw-r--r--glances/client.py37
-rw-r--r--glances/client_browser.py22
-rw-r--r--glances/config.py13
-rw-r--r--glances/cpu_percent.py7
-rw-r--r--glances/event.py1
-rw-r--r--glances/events_list.py3
-rw-r--r--glances/exports/export.py25
-rw-r--r--glances/exports/glances_cassandra/__init__.py34
-rw-r--r--glances/exports/glances_couchdb/__init__.py17
-rw-r--r--glances/exports/glances_csv/__init__.py19
-rw-r--r--glances/exports/glances_elasticsearch/__init__.py23
-rw-r--r--glances/exports/glances_graph/__init__.py15
-rw-r--r--glances/exports/glances_graphite/__init__.py13
-rw-r--r--glances/exports/glances_influxdb/__init__.py19
-rw-r--r--glances/exports/glances_influxdb2/__init__.py23
-rw-r--r--glances/exports/glances_json/__init__.py14
-rw-r--r--glances/exports/glances_kafka/__init__.py15
-rw-r--r--glances/exports/glances_mongodb/__init__.py11
-rwxr-xr-xglances/exports/glances_mqtt/__init__.py9
-rw-r--r--glances/exports/glances_opentsdb/__init__.py13
-rw-r--r--glances/exports/glances_prometheus/__init__.py9
-rw-r--r--glances/exports/glances_rabbitmq/__init__.py7
-rw-r--r--glances/exports/glances_restful/__init__.py9
-rw-r--r--glances/exports/glances_riemann/__init__.py7
-rw-r--r--glances/exports/glances_statsd/__init__.py11
-rw-r--r--glances/exports/glances_zeromq/__init__.py13
-rw-r--r--glances/filter.py9
-rw-r--r--glances/folder_list.py5
-rw-r--r--glances/globals.py7
-rw-r--r--glances/history.py3
-rw-r--r--glances/logger.py5
-rw-r--r--glances/main.py27
-rw-r--r--glances/outdated.py21
-rw-r--r--glances/outputs/glances_bars.py7
-rw-r--r--glances/outputs/glances_curses.py43
-rw-r--r--glances/outputs/glances_curses_browser.py29
-rw-r--r--glances/outputs/glances_restful_api.py147
-rw-r--r--glances/outputs/glances_sparklines.py11
-rw-r--r--glances/outputs/glances_stdout.py13
-rw-r--r--glances/outputs/glances_stdout_apidoc.py49
-rw-r--r--glances/outputs/glances_stdout_csv.py17
-rw-r--r--glances/outputs/glances_stdout_issue.py25
-rw-r--r--glances/outputs/glances_stdout_json.py5
-rw-r--r--glances/outputs/glances_unicode.py1
-rw-r--r--glances/password.py11
-rw-r--r--glances/password_list.py9
-rw-r--r--glances/plugins/alert/__init__.py7
-rw-r--r--glances/plugins/amps/__init__.py9
-rw-r--r--glances/plugins/cloud/__init__.py13
-rw-r--r--glances/plugins/connections/__init__.py15
-rw-r--r--glances/plugins/containers/__init__.py21
-rw-r--r--glances/plugins/containers/engines/docker.py13
-rw-r--r--glances/plugins/containers/engines/podman.py15
-rw-r--r--glances/plugins/containers/stats_streamer.py3
-rw-r--r--glances/plugins/core/__init__.py3
-rw-r--r--glances/plugins/cpu/__init__.py5
-rw-r--r--glances/plugins/diskio/__init__.py17
-rw-r--r--glances/plugins/folders/__init__.py9
-rw-r--r--glances/plugins/fs/__init__.py9
-rw-r--r--glances/plugins/gpu/__init__.py17
-rw-r--r--glances/plugins/gpu/cards/amd.py1
-rw-r--r--glances/plugins/gpu/cards/nvidia.py5
-rw-r--r--glances/plugins/help/__init__.py15
-rw-r--r--glances/plugins/ip/__init__.py17
-rw-r--r--glances/plugins/irq/__init__.py15
-rw-r--r--glances/plugins/load/__init__.py19
-rw-r--r--glances/plugins/mem/__init__.py5
-rw-r--r--glances/plugins/memswap/__init__.py5
-rw-r--r--glances/plugins/network/__init__.py19
-rw-r--r--glances/plugins/now/__init__.py5
-rw-r--r--glances/plugins/percpu/__init__.py13
-rw-r--r--glances/plugins/plugin/model.py33
-rw-r--r--glances/plugins/ports/__init__.py29
-rw-r--r--glances/plugins/processcount/__init__.py13
-rw-r--r--glances/plugins/processlist/__init__.py17
-rw-r--r--glances/plugins/psutilversion/__init__.py3
-rw-r--r--glances/plugins/quicklook/__init__.py17
-rw-r--r--glances/plugins/raid/__init__.py13
-rw-r--r--glances/plugins/sensors/__init__.py23
-rw-r--r--glances/plugins/sensors/sensor/glances_batpercent.py9
-rw-r--r--glances/plugins/sensors/sensor/glances_hddtemp.py9
-rw-r--r--glances/plugins/smart/__init__.py13
-rw-r--r--glances/plugins/system/__init__.py9
-rw-r--r--glances/plugins/uptime/__init__.py5
-rw-r--r--glances/plugins/version/__init__.py3
-rw-r--r--glances/plugins/wifi/__init__.py13
-rw-r--r--glances/ports_list.py27
-rw-r--r--glances/processes.py25
-rw-r--r--glances/programs.py1
-rw-r--r--glances/secure.py3
-rw-r--r--glances/server.py21
-rw-r--r--glances/snmp.py5
-rw-r--r--glances/standalone.py31
-rw-r--r--glances/static_list.py19
-rw-r--r--glances/stats.py21
-rw-r--r--glances/stats_client.py9
-rw-r--r--glances/stats_client_snmp.py7
-rw-r--r--glances/stats_server.py5
-rw-r--r--glances/thresholds.py5
-rw-r--r--glances/timer.py5
-rw-r--r--glances/web_list.py29
-rw-r--r--glances/webserver.py3
-rw-r--r--pyproject.toml2
-rwxr-xr-xrun.py1
-rwxr-xr-xsetup.py15
-rwxr-xr-xunittest-core.py79
-rwxr-xr-xunittest-restful.py93
-rwxr-xr-xunittest-xmlrpc.py35
120 files changed, 835 insertions, 1060 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 5cdfc920..de8ac1c7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#
# Glances documentation build configuration file, created by
# sphinx-quickstart on Tue Mar 1 10:53:59 2016.
diff --git a/glances/__init__.py b/glances/__init__.py
index a96d0a06..e8ff04cb 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#
# This file is part of Glances.
#
@@ -44,11 +43,6 @@ try:
except locale.Error:
print("Warning: Unable to set locale. Expect encoding problems.")
-# Check Python version
-if sys.version_info < (3, 4):
- print('Glances requires at least Python 3.4 to run.')
- sys.exit(1)
-
# Check psutil version
psutil_min_version = (5, 3, 0)
psutil_version_info = tuple([int(num) for num in psutil_version.split('.')])
@@ -56,11 +50,12 @@ if psutil_version_info < psutil_min_version:
print('psutil 5.3.0 or higher is needed. Glances cannot start.')
sys.exit(1)
+
# Trac malloc is only available on Python 3.4 or higher
def __signal_handler(signal, frame):
- logger.debug("Signal {} catched".format(signal))
+ logger.debug(f"Signal {signal} catched")
end()
@@ -103,20 +98,16 @@ def start(config, args):
from glances.webserver import GlancesWebServer as GlancesMode
# Init the mode
- logger.info("Start {} mode".format(GlancesMode.__name__))
+ logger.info(f"Start {GlancesMode.__name__} mode")
mode = GlancesMode(config=config, args=args)
# Start the main loop
- logger.debug("Glances started in {} seconds".format(start_duration.get()))
+ logger.debug(f"Glances started in {start_duration.get()} seconds")
if args.stop_after:
- logger.info('Glances will be stopped in ~{} seconds'.format(args.stop_after * args.time))
+ logger.info(f'Glances will be stopped in ~{args.stop_after * args.time} seconds')
if args.memory_leak:
- print(
- 'Memory leak detection, please wait ~{} seconds...'.format(
- args.stop_after * args.time * args.memory_leak * 2
- )
- )
+ print(f'Memory leak detection, please wait ~{args.stop_after * args.time * args.memory_leak * 2} seconds...')
# First run without dump to fill the memory
mode.serve_n(args.stop_after)
# Then start the memory-leak loop
@@ -133,7 +124,7 @@ def start(config, args):
snapshot_end = tracemalloc.take_snapshot()
snapshot_diff = snapshot_end.compare_to(snapshot_begin, 'filename')
memory_leak = sum([s.size_diff for s in snapshot_diff])
- print("Memory consumption: {0:.1f}KB (see log for details)".format(memory_leak / 1000))
+ print(f"Memory consumption: {memory_leak / 1000:.1f}KB (see log for details)")
logger.info("Memory consumption (top 5):")
for stat in snapshot_diff[:5]:
logger.info(stat)
@@ -165,12 +156,10 @@ def main():
signal.signal(sig, __signal_handler)
# Log Glances and psutil version
- logger.info('Start Glances {}'.format(__version__))
- logger.info(
- '{} {} ({}) and psutil {} detected'.format(
- platform.python_implementation(), platform.python_version(), sys.executable, psutil_version
- )
- )
+ logger.info(f'Start Glances {__version__}')
+ python_impl = platform.python_implementation()
+ python_ver = platform.python_version()
+ logger.info(f'{python_impl} {python_ver} ({sys.executable}) and psutil {psutil_version} detected')
# Share global var
gl