diff --git a/Makefile b/Makefile index 8e2dce2a..8c04a08d 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ test: venv-upgrade venv-dev-upgrade ## Run unit tests format: venv-dev-upgrade ## Format the code @git ls-files '*.py' | xargs ./venv/bin/python -m autopep8 --in-place --jobs 0 --global-config=.flake8 - @git ls-files '*.py' | xargs ./venv/bin/python -m autoflake --in-place --jobs 0 --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys + @git ls-files '*.py' | xargs ./venv/bin/python -m autoflake --in-place --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys --exclude="compat.py" ./venv/bin/python -m black ./glances --exclude outputs/static flake8: venv-dev-upgrade ## Run flake8 linter. diff --git a/docs/conf.py b/docs/conf.py index ade53f17..26b188d6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,6 +12,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. +from glances import __version__ import sys import os from datetime import datetime @@ -24,7 +25,6 @@ from datetime import datetime # Insert Glances' path into the system. sys.path.insert(0, os.path.abspath('..')) -from glances import __version__ # -- General configuration ------------------------------------------------ @@ -223,17 +223,17 @@ htmlhelp_basename = 'Glancesdoc' # -- Options for LaTeX output --------------------------------------------- latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', + # The paper size ('letterpaper' or 'a4paper'). + # 'papersize': 'letterpaper', -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', + # The font size ('10pt', '11pt' or '12pt'). + # 'pointsize': '10pt', -# Additional stuff for the LaTeX preamble. -#'preamble': '', + # Additional stuff for the LaTeX preamble. + # 'preamble': '', -# Latex figure (float) alignment -#'figure_align': 'htbp', + # Latex figure (float) alignment + # 'figure_align': 'htbp', } # Grouping the document tree into LaTeX files. List of tuples diff --git a/glances/amps/glances_amp.py b/glances/amps/glances_amp.py index ecb7092f..1c9175bd 100644 --- a/glances/amps/glances_amp.py +++ b/glances/amps/glances_amp.py @@ -22,7 +22,7 @@ The return string is a string with one or more line (\n between lines). If the *one_line* var is true then the AMP will be displayed in one line. """ -from glances.compat import u, b, n, nativestr +from glances.compat import u from glances.timer import Timer from glances.logger import logger diff --git a/glances/exports/glances_cassandra.py b/glances/exports/glances_cassandra.py index b8bb33b9..e3a347c8 100644 --- a/glances/exports/glances_cassandra.py +++ b/glances/exports/glances_cassandra.py @@ -15,7 +15,6 @@ from numbers import Number from glances.logger import logger from glances.exports.glances_export import GlancesExport -from glances.compat import iteritems from cassandra.auth import PlainTextAuthProvider from cassandra.cluster import Cluster @@ -77,7 +76,7 @@ class Export(GlancesExport): # Keyspace try: session.set_keyspace(self.keyspace) - except InvalidRequest as e: + except InvalidRequest: logger.info("Create keyspace {} on the Cassandra cluster".format(self.keyspace)) c = "CREATE KEYSPACE %s WITH replication = { 'class': 'SimpleStrategy', 'replication_factor': '%s' }" % ( self.keyspace, diff --git a/glances/exports/glances_couchdb.py b/glances/exports/glances_couchdb.py index 249d53cb..07d2cbd2 100644 --- a/glances/exports/glances_couchdb.py +++ b/glances/exports/glances_couchdb.py @@ -62,7 +62,7 @@ class Export(GlancesExport): try: s[self.db] - except Exception as e: + except Exception: # Database did not exist # Create it... s.create(self.db) diff --git a/glances/exports/glances_elasticsearch.py b/glances/exports/glances_elasticsearch.py index 960236e0..5fa5f1d4 100644 --- a/glances/exports/glances_elasticsearch.py +++ b/glances/exports/glances_elasticsearch.py @@ -16,7 +16,6 @@ from glances.logger import logger from glances.exports.glances_export import GlancesExport from elasticsearch import Elasticsearch, helpers -from elasticsearch import __version__ as elk_version class Export(GlancesExport): diff --git a/glances/exports/glances_graph.py b/glances/exports/glances_graph.py index 5c33e4f8..51b77b2a 100644 --- a/glances/exports/glances_graph.py +++ b/glances/exports/glances_graph.py @@ -51,7 +51,7 @@ class Export(GlancesExport): # Check if output folder is writeable try: tempfile.TemporaryFile(dir=self.path) - except OSError as e: + except OSError: logger.critical("Graph output folder {} is not writeable".format(self.path)) sys.exit(2) diff --git a/glances/exports/glances_kafka.py b/glances/exports/glances_kafka.py index 936d4bff..275b9595 100644 --- a/glances/exports/glances_kafka.py +++ b/glances/exports/glances_kafka.py @@ -12,12 +12,10 @@ import sys from glances.logger import logger -from glances.compat import iteritems from glances.exports.glances_export import GlancesExport from kafka import KafkaProducer import json -import codecs class Export(GlancesExport): diff --git a/glances/exports/glances_restful.py b/glances/exports/glances_restful.py index 975bc1d5..8afe32b1 100644 --- a/glances/exports/glances_restful.py +++ b/glances/exports/glances_restful.py @@ -9,7 +9,6 @@ """RESTful interface class.""" -import sys from glances.compat import listkeys from glances.logger import logger diff --git a/glances/exports/glances_riemann.py b/glances/exports/glances_riemann.py index b500b829..5cae105d 100644 --- a/glances/exports/glances_riemann.py +++ b/glances/exports/glances_riemann.py @@ -10,7 +10,6 @@ """Riemann interface class.""" import socket -import sys from numbers import Number from glances.compat import range diff --git a/glances/exports/glances_statsd.py b/glances/exports/glances_statsd.py index ba65bd82..022d61eb 100644 --- a/glances/exports/glances_statsd.py +++ b/glances/exports/glances_statsd.py @@ -9,7 +9,6 @@ """Statsd interface class.""" -import sys from numbers import Number from glances.compat import range diff --git a/glances/logger.py b/glances/logger.py index ffde42b8..3da96356 100644 --- a/glances/logger.py +++ b/glances/logger.py @@ -17,7 +17,6 @@ import tempfile import logging import logging.config -from glances.globals import BSD, LINUX, MACOS, SUNOS, WINDOWS, WSL from glances.globals import safe_makedirs # Choose the good place for the log file (see issue #1575) diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index fc13473c..32a5cbec 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -198,7 +198,6 @@ class GlancesBottle(object): def end(self): """End the bottle.""" - pass def _index(self, refresh_time=None): """Bottle callback for index.html (/) file.""" diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index 1993a2ba..0e55b609 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -1231,15 +1231,11 @@ class GlancesCursesStandalone(_GlancesCurses): """Class for the Glances curse standalone.""" - pass - class GlancesCursesClient(_GlancesCurses): """Class for the Glances curse client.""" - pass - class GlancesTextbox(Textbox, object): def __init__(self, *args, **kwargs): diff --git a/glances/outputs/glances_curses_browser.py b/glances/outputs/glances_curses_browser.py index 19419375..caa567f4 100644 --- a/glances/outputs/glances_curses_browser.py +++ b/glances/outputs/glances_curses_browser.py @@ -9,7 +9,6 @@ """Curses browser interface class .""" -import sys import math import curses from glances.outputs.glances_curses import _GlancesCurses diff --git a/glances/outputs/glances_sparklines.py b/glances/outputs/glances_sparklines.py index bb0fd9ba..95825d2e 100644 --- a/glances/outputs/glances_sparklines.py +++ b/glances/outputs/glances_sparklines.py @@ -12,7 +12,6 @@ from __future__ import unicode_literals from __future__ import division import sys -from math import modf from glances.logger import logger from glances.compat import nativestr diff --git a/glances/outputs/glances_stdout_csv.py b/glances/outputs/glances_stdout_csv.py index 7a48aa6f..7822608f 100644 --- a/glances/outputs/glances_stdout_csv.py +++ b/glances/outputs/glances_stdout_csv.py @@ -11,7 +11,6 @@ import time -from glances.logger import logger from glances.compat import printandflush diff --git a/glances/outputs/glances_stdout_issue.py b/glances/outputs/glances_stdout_issue.py index 22452c9a..f294c1d4 100644 --- a/glances/outputs/glances_stdout_issue.py +++ b/glances/outputs/glances_stdout_issue.py @@ -81,7 +81,7 @@ class GlancesStdoutIssue(object): try: # Update the stats stats._plugins[plugin].update() - except Exception as e: + except Exception: pass time.sleep(3) diff --git a/glances/outputs/glances_stdout_json.py b/glances/outputs/glances_stdout_json.py index 304851ce..0bab0173 100644 --- a/glances/outputs/glances_stdout_json.py +++ b/glances/outputs/glances_stdout_json.py @@ -11,7 +11,6 @@ import time -from glances.logger import logger from glances.compat import printandflush diff --git a/glances/plugins/glances_alert.py b/glances/plugins/glances_alert.py index 9334ec93..e02d3d77 100644 --- a/glances/plugins/glances_alert.py +++ b/glances/plugins/glances_alert.py @@ -11,7 +11,6 @@ from datetime import datetime -from glances.logger import logger from glances.events import glances_events from glances.thresholds import glances_thresholds diff --git a/glances/plugins/glances_cpu.py b/glances/plugins/glances_cpu.py index 2f7ec9a6..7ee4c977 100644 --- a/glances/plugins/glances_cpu.py +++ b/glances/plugins/glances_cpu.py @@ -9,7 +9,6 @@ """CPU plugin.""" -from glances.logger import logger from glances.timer import getTimeSinceLastUpdate from glances.compat import iterkeys from glances.cpu_percent import cpu_percent diff --git a/glances/plugins/glances_diskio.py b/glances/plugins/glances_diskio.py index 231332c3..a238e6d0 100644 --- a/glances/plugins/glances_diskio.py +++ b/glances/plugins/glances_diskio.py @@ -13,7 +13,6 @@ from __future__ import unicode_literals from glances.compat import nativestr, n from glances.timer import getTimeSinceLastUpdate from glances.plugins.glances_plugin import GlancesPlugin -from glances.logger import logger import psutil diff --git a/glances/plugins/glances_folders.py b/glances/plugins/glances_folders.py index ef9b6d49..3a8d9710 100644 --- a/glances/plugins/glances_folders.py +++ b/glances/plugins/glances_folders.py @@ -15,7 +15,6 @@ import numbers from glances.compat import nativestr from glances.folder_list import FolderList as glancesFolderList from glances.plugins.glances_plugin import GlancesPlugin -from glances.logger import logger class Plugin(GlancesPlugin): diff --git a/glances/plugins/glances_help.py b/glances/plugins/glances_help.py index 390f7633..2d3fadf2 100644 --- a/glances/plugins/glances_help.py +++ b/glances/plugins/glances_help.py @@ -36,11 +36,9 @@ class Plugin(GlancesPlugin): def reset(self): """No stats. It is just a plugin to display the help.""" - pass def update(self): """No stats. It is just a plugin to display the help.""" - pass def generate_view_data(self): """Generate the views.""" diff --git a/glances/plugins/glances_ip.py b/glances/plugins/glances_ip.py index 8919130c..5e0c9c06 100644 --- a/glances/plugins/glances_ip.py +++ b/glances/plugins/glances_ip.py @@ -12,7 +12,7 @@ import threading from json import loads -from glances.compat import iterkeys, urlopen, queue, urlopen_auth +from glances.compat import queue, urlopen, urlopen_auth from glances.logger import logger from glances.timer import Timer, getTimeSinceLastUpdate from glances.plugins.glances_plugin import GlancesPlugin diff --git a/glances/plugins/glances_mem.py b/glances/plugins/glances_mem.py index e638bdd3..27ff03b1 100644 --- a/glances/plugins/glances_mem.py +++ b/glances/plugins/glances_mem.py @@ -9,7 +9,6 @@ """Virtual memory plugin.""" -from glances.logger import logger from glances.compat import iterkeys from glances.plugins.glances_plugin import GlancesPlugin diff --git a/glances/plugins/glances_ports.py b/glances/plugins/glances_ports.py index e6608e7b..3d43f258 100644 --- a/glances/plugins/glances_ports.py +++ b/glances/plugins/glances_ports.py @@ -19,7 +19,7 @@ import numbers from glances.globals import WINDOWS, MACOS, BSD from glances.ports_list import GlancesPortsList from glances.web_list import GlancesWebList -from glances.timer import Timer, Counter +from glances.timer import Counter from glances.compat import bool_type from glances.logger import logger from glances.plugins.glances_plugin import GlancesPlugin diff --git a/glances/plugins/glances_quicklook.py b/glances/plugins/glances_quicklook.py index f6d569a7..e1cdac70 100644 --- a/glances/plugins/glances_quicklook.py +++ b/glances/plugins/glances_quicklook.py @@ -10,7 +10,6 @@ """Quicklook plugin.""" from glances.cpu_percent import cpu_percent -from glances.logger import logger from glances.outputs.glances_bars import Bar from glances.outputs.glances_sparklines import Sparkline from glances.plugins.glances_plugin import GlancesPlugin diff --git a/glances/plugins/glances_system.py b/glances/plugins/glances_system.py index 88f2ee9e..836f92b9 100644 --- a/glances/plugins/glances_system.py +++ b/glances/plugins/glances_system.py @@ -14,7 +14,6 @@ import platform import re from io import open -from glances.logger import logger from glances.compat import iteritems from glances.plugins.glances_plugin import GlancesPlugin diff --git a/glances/plugins/glances_wifi.py b/glances/plugins/glances_wifi.py index cd0268f0..624c3df6 100644 --- a/glances/plugins/glances_wifi.py +++ b/glances/plugins/glances_wifi.py @@ -90,11 +90,9 @@ class Plugin(GlancesPlugin): except InterfaceError as e: # Not a Wifi interface logger.debug("WIFI plugin: Scan InterfaceError ({})".format(e)) - pass except Exception as e: # Other error logger.debug("WIFI plugin: Can not grab cell stats ({})".format(e)) - pass else: for wifi_cell in wifi_cells: hotspot = { diff --git a/glances/server.py b/glances/server.py index 4048b0e4..a4c5e88f 100644 --- a/glances/server.py +++ b/glances/server.py @@ -15,7 +15,7 @@ import sys from base64 import b64decode from glances import __version__ -from glances.compat import SimpleXMLRPCRequestHandler, SimpleXMLRPCServer, Server +from glances.compat import SimpleXMLRPCRequestHandler, SimpleXMLRPCServer from glances.autodiscover import GlancesAutoDiscoverClient from glances.logger import logger from glances.stats_server import GlancesStatsServer diff --git a/setup.py b/setup.py index 925b2206..06764efd 100755 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def get_install_extras_require(): 'sparklines': ['sparklines'], 'web': ['bottle', 'requests'], 'wifi': ['wifi'] - #'gpu' and 'sensors' ==> See bellow + # 'gpu' and 'sensors' ==> See bellow } if PY3: extras_require['export'].append('influxdb-client') diff --git a/unitest.py b/unitest.py index d6f29888..f49bb687 100755 --- a/unitest.py +++ b/unitest.py @@ -30,7 +30,7 @@ from glances.secure import secure_popen from glances.compat import PY3 if PY3: - from tracemalloc import Snapshot + pass # Global variables # =================