Reformat with Black

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
@@ -19,24 +20,23 @@ from datetime import datetime
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))
 
 # Insert Glances' path into the system.
 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.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-#extensions = ['sphinxcontrib.autohttp.bottle']
+# extensions = ['sphinxcontrib.autohttp.bottle']
 extensions = ['sphinx.ext.intersphinx']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -48,7 +48,7 @@ templates_path = ['_templates']
 source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
@@ -76,13 +76,13 @@ release = version
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -90,27 +90,27 @@ exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -129,23 +129,23 @@ html_theme_options = {
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -155,15 +155,15 @@ html_static_path = ['_static']
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+# html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
@@ -177,47 +177,47 @@ html_sidebars = {
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
 html_show_sourcelink = False
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
 #   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
 #   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr'
-#html_search_language = 'en'
+# html_search_language = 'en'
 
 # A dictionary with options for the search language support, empty by default.
 # Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
+# html_search_options = {'type': 'default'}
 
 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
+# html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Glancesdoc'
@@ -248,23 +248,23 @@ latex_documents = [
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output ---------------------------------------
@@ -277,7 +277,7 @@ man_pages = [
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -292,13 +292,13 @@ texinfo_documents = [
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+# texinfo_no_detailmenu = False

glances/amps/glances_amp.py

@@ -42,7 +42,7 @@ class GlancesAmp(object):
 
         # AMP name (= module name without glances_)
         if name is None:
-            self.amp_name = self.__class__.__module__[len('glances_'):]
+            self.amp_name = self.__class__.__module__[len('glances_') :]
         else:
             self.amp_name = name
 

glances/amps_list.py

@@ -142,9 +142,9 @@ class AmpsList(object):
             # Search in both cmdline and name (for kernel thread, see #1261)
             for p in processlist:
                 if (re.search(amp_value.regex(), p['name']) is not None) or (
-                    p['cmdline'] is not None and
+                    p['cmdline'] is not None
-                    p['cmdline'] != [] and
+                    and p['cmdline'] != []
-                    re.search(amp_value.regex(), ' '.join(p['cmdline'])) is not None
+                    and re.search(amp_value.regex(), ' '.join(p['cmdline'])) is not None
                 ):
                     ret.append(
                         {'pid': p['pid'], 'cpu_percent': p['cpu_percent'], 'memory_percent': p['memory_percent']}

glances/compat.py

@@ -35,7 +35,6 @@ if PY3:
     from urllib.error import HTTPError, URLError
     from urllib.parse import urlparse
 
-
     # Correct issue #1025 by monkey path the xmlrpc lib
     from defusedxml.xmlrpc import monkey_patch
 

glances/exports/glances_export.py

@@ -41,7 +41,7 @@ class GlancesExport(object):
     def __init__(self, config=None, args=None):
         """Init the export class."""
         # Export name (= module name without glances_)
-        self.export_name = self.__class__.__module__[len('glances_'):]
+        self.export_name = self.__class__.__module__[len('glances_') :]
         logger.debug("Init export module %s" % self.export_name)
 
         # Init the config & args

glances/main.py

@@ -550,6 +550,7 @@ Examples of use:
             logger.setLevel(DEBUG)
         else:
             from warnings import simplefilter
+
             simplefilter("ignore")
 
         # Plugins refresh rate

glances/outputs/glances_curses.py

@@ -330,7 +330,7 @@ class _GlancesCurses(object):
             'CRITICAL_LOG': self.ifCRITICAL_color,
             'PASSWORD': curses.A_PROTECT,
             'SELECTED': self.selected_color,
-            'INFO': self.ifINFO_color
+            'INFO': self.ifINFO_color,
         }
 
     def set_cursor(self, value):

glances/outputs/glances_stdout_issue.py

@@ -113,14 +113,14 @@ class GlancesStdoutIssue(object):
                 )
                 if isinstance(stat, list) and len(stat) > 0 and 'key' in stat[0]:
                     key = 'key={} '.format(stat[0]['key'])
-                    message = colors.ORANGE + key + colors.NO + str(stat)[0: TERMINAL_WIDTH - 41 - len(key)]
+                    message = colors.ORANGE + key + colors.NO + str(stat)[0 : TERMINAL_WIDTH - 41 - len(key)]
                 else:
-                    message = colors.NO + str(stat)[0: TERMINAL_WIDTH - 41]
+                    message = colors.NO + str(stat)[0 : TERMINAL_WIDTH - 41]
             else:
                 result = (colors.RED + '[ERROR]' + colors.BLUE + ' {:.5f}s '.format(counter.get())).rjust(
                     41 - len(plugin)
                 )
-                message = colors.NO + str(stat_error)[0: TERMINAL_WIDTH - 41]
+                message = colors.NO + str(stat_error)[0 : TERMINAL_WIDTH - 41]
             self.print_issue(plugin, result, message)
 
         # Display total time need to update all plugins

glances/plugins/glances_cloud.py

@@ -111,9 +111,7 @@ class Plugin(GlancesPlugin):
         msg = self.stats.get('platform', 'Unknown')
         ret.append(self.curse_add_line(msg, "TITLE"))
         msg = ' {} instance {} ({})'.format(
-            self.stats.get('type', 'Unknown'),
+            self.stats.get('type', 'Unknown'), self.stats.get('name', 'Unknown'), self.stats.get('region', 'Unknown')
-            self.stats.get('name', 'Unknown'),
-            self.stats.get('region', 'Unknown')
         )
         ret.append(self.curse_add_line(msg))
 

glances/plugins/glances_processlist.py

@@ -325,8 +325,8 @@ class Plugin(GlancesPlugin):
             # Display rate if stats is available and io_tag ([4]) == 1
             # IO
             io = int(
-                (p['io_counters'][0 if rorw == 'ior' else 1] - p['io_counters'][2 if rorw == 'ior' else 3]) /
+                (p['io_counters'][0 if rorw == 'ior' else 1] - p['io_counters'][2 if rorw == 'ior' else 3])
-                p['time_since_update']
+                / p['time_since_update']
             )
             if io == 0:
                 msg = self.layout_stat[rorw].format("0")
@@ -357,8 +357,11 @@ class Plugin(GlancesPlugin):
         # When a process is selected:
         # * display a special character at the beginning of the line
         # * underline the command name
-        ret.append(self.curse_add_line(unicode_message('PROCESS_SELECTOR') if (selected and not args.disable_cursor)
+        ret.append(
-                                       else ' ', 'SELECTED'))
+            self.curse_add_line(
+                unicode_message('PROCESS_SELECTOR') if (selected and not args.disable_cursor) else ' ', 'SELECTED'
+            )
+        )
 
         # CPU
         ret.append(self._get_process_curses_cpu(p, selected, args))
@@ -433,10 +436,12 @@ class Plugin(GlancesPlugin):
         return ret
 
     def is_selected_process(self, args):
-        return args.is_standalone and \
+        return (
-           self.args.enable_process_extended and \
+            args.is_standalone
-           args.cursor_position is not None and \
+            and self.args.enable_process_extended
-           glances_processes.extended_process is not None
+            and args.cursor_position is not None
+            and glances_processes.extended_process is not None
+        )
 
     def msg_curse(self, args=None, max_width=None):
         """Return the dict to display in the curse interface."""
@@ -468,9 +473,7 @@ class Plugin(GlancesPlugin):
         # This is a Glances bottleneck (see flame graph),
         # get_process_curses_data should be optimzed
         for position, process in enumerate(processes_list_sorted):
-            ret.extend(self.get_process_curses_data(process,
+            ret.extend(self.get_process_curses_data(process, position == args.cursor_position, args))
-                                                    position == args.cursor_position,
-                                                    args))
 
         # A filter is set Display the stats summaries
         if glances_processes.process_filter is not None:
@@ -578,12 +581,20 @@ class Plugin(GlancesPlugin):
         if 'memory_info' in p and p['memory_info'] is not None:
             ret.append(self.curse_add_line(' Memory info: '))
             for k in p['memory_info']._asdict():
-                ret.append(self.curse_add_line(self.auto_unit(p['memory_info']._asdict()[k], low_precision=False),
+                ret.append(
-                                               decoration='INFO', splittable=True))
+                    self.curse_add_line(
+                        self.auto_unit(p['memory_info']._asdict()[k], low_precision=False),
+                        decoration='INFO',
+                        splittable=True,
+                    )
+                )
                 ret.append(self.curse_add_line(' ' + k + ' ', splittable=True))
             if 'memory_swap' in p and p['memory_swap'] is not None:
-                ret.append(self.curse_add_line(self.auto_unit(p['memory_swap'], low_precision=False),
+                ret.append(
-                                               decoration='INFO', splittable=True))
+                    self.curse_add_line(
+                        self.auto_unit(p['memory_swap'], low_precision=False), decoration='INFO', splittable=True
+                    )
+                )
                 ret.append(self.curse_add_line(' swap ', splittable=True))
 
         # Third line is for open files/network sessions
@@ -650,8 +661,7 @@ class Plugin(GlancesPlugin):
                 shortkey = "('e' to pin | 'k' to kill)"
         else:
             shortkey = ""
-        msg = self.layout_header['command'].format("Programs" if self.args.programs else "Command",
+        msg = self.layout_header['command'].format("Programs" if self.args.programs else "Command", shortkey)
-                                                   shortkey)
         ret.append(self.curse_add_line(msg, sort_style if process_sort_key == 'name' else 'DEFAULT'))
 
     def __msg_curse_sum(self, ret, sep_char='_', mmm=None, args=None):
@@ -675,9 +685,9 @@ class Plugin(GlancesPlugin):
         ret.append(self.curse_add_line(msg, decoration=self.__mmm_deco(mmm)))
         # VIRT and RES memory sum
         if (
-            'memory_info' in self.stats[0] and
+            'memory_info' in self.stats[0]
-            self.stats[0]['memory_info'] is not None and
+            and self.stats[0]['memory_info'] is not None
-            self.stats[0]['memory_info'] != ''
+            and self.stats[0]['memory_info'] != ''
         ):
             # VMS
             msg = self.layout_stat['virt'].format(

glances/plugins/glances_wifi.py

@@ -188,7 +188,9 @@ class Plugin(GlancesPlugin):
             # Add the new hotspot to the message
             msg = '{:{width}}'.format(nativestr(hotspot_name), width=if_name_max_width)
             ret.append(self.curse_add_line(msg))
-            msg = '{:>7}'.format(i['signal'], )
+            msg = '{:>7}'.format(
+                i['signal'],
+            )
             ret.append(
                 self.curse_add_line(msg, self.get_views(item=i[self.get_key()], key='signal', option='decoration'))
             )

glances/processes.py

@@ -313,15 +313,19 @@ class GlancesProcesses(object):
                 if stat_prefix + '_min' not in self.extended_process:
                     ret[stat_prefix + '_min'] = proc[stat_prefix + '_percent']
                 else:
-                    ret[stat_prefix + '_min'] = \
+                    ret[stat_prefix + '_min'] = (
-                        proc[stat_prefix + '_percent'] if proc[stat_prefix + '_min'] > proc[stat_prefix + '_percent'] \
+                        proc[stat_prefix + '_percent']
+                        if proc[stat_prefix + '_min'] > proc[stat_prefix + '_percent']
                         else proc[stat_prefix + '_min']
+                    )
                 if stat_prefix + '_max' not in self.extended_process:
                     ret[stat_prefix + '_max'] = proc[stat_prefix + '_percent']
                 else:
-                    ret[stat_prefix + '_max'] = \
+                    ret[stat_prefix + '_max'] = (
-                        proc[stat_prefix + '_percent'] if proc[stat_prefix + '_max'] < proc[stat_prefix + '_percent'] \
+                        proc[stat_prefix + '_percent']
+                        if proc[stat_prefix + '_max'] < proc[stat_prefix + '_percent']
                         else proc[stat_prefix + '_max']
+                    )
                 if stat_prefix + '_mean_sum' not in self.extended_process:
                     ret[stat_prefix + '_mean_sum'] = proc[stat_prefix + '_percent']
                 else:
@@ -337,14 +341,16 @@ class GlancesProcesses(object):
 
     def is_selected_extended_process(self, position):
         """Return True if the process is the selected one for extended stats."""
-        return hasattr(self.args, 'programs') and \
+        return (
-               not self.args.programs and \
+            hasattr(self.args, 'programs')
-               hasattr(self.args, 'enable_process_extended') and \
+            and not self.args.programs
-               self.args.enable_process_extended and \
+            and hasattr(self.args, 'enable_process_extended')
-               not self.disable_extended_tag and \
+            and self.args.enable_process_extended
-               hasattr(self.args, 'cursor_position') and \
+            and not self.disable_extended_tag
-               position == self.args.cursor_position and \
+            and hasattr(self.args, 'cursor_position')
-               not self.args.disable_cursor
+            and position == self.args.cursor_position
+            and not self.args.disable_cursor
+        )
 
     def update(self):
         """Update the processes stats."""
@@ -416,8 +422,7 @@ class GlancesProcesses(object):
                 self.extended_process = proc
 
             # Grab extended stats only for the selected process (see issue #2225)
-            if self.extended_process is not None and \
+            if self.extended_process is not None and proc['pid'] == self.extended_process['pid']:
-               proc['pid'] == self.extended_process['pid']:
                 proc.update(self.get_extended_stats(self.extended_process))
                 self.extended_process = proc