Apply suggestions from code review

Co-authored-by: Carlos Cordoba <[email protected]>

Author: mrclary

spyder/plugins/ipythonconsole/widgets/client.py

@@ -245,13 +245,15 @@ def _create_loading_page(self, env=False):
         if os.name == 'nt':
             loading_img = loading_img.replace('\\', '/')
         message = _("Connecting to kernel...")
+
         if env:
             message = _("Retrieving environment variables...")
         page = loading_template.substitute(
             css_path=self.css_path,
             loading_img=loading_img,
             message=message
         )
+
         return page
 
     def _create_blank_page(self):

spyder/plugins/ipythonconsole/widgets/main_widget.py

@@ -1817,8 +1817,13 @@ def get_current_shellwidget(self) -> ShellWidget | None:
     @Slot(bool, bool)
     @Slot(bool, str, bool)
     def create_new_client(
-        self, give_focus=True, filename='', special=None,
-        given_name=None, cache=True, initial_cwd=None,
+        self,
+        give_focus=True,
+        filename='',
+        special=None,
+        given_name=None,
+        cache=True,
+        initial_cwd=None,
         path_to_custom_interpreter=None
     ):
         """
@@ -2542,21 +2547,36 @@ def run_script(self, filename, wdir, args, post_mortem, current_client,
             )
             return
 
-        def _rs():
+        def _run():
             # Freeze parameters for use in signal connect
             self._run_script(
-                filename, wdir, args, post_mortem, clear_variables,
-                console_namespace, method, client, current_client
+                filename,
+                wdir,
+                args,
+                post_mortem,
+                clear_variables,
+                console_namespace,
+                method,
+                client,
+                current_client
             )
 
         if client.shellwidget.spyder_kernel_ready:
-            _rs()
+            _run()
         else:
-            client.shellwidget.sig_prompt_ready.connect(_rs)
+            client.shellwidget.sig_prompt_ready.connect(_run)
 
     def _run_script(
-        self, filename, wdir, args, post_mortem, clear_variables,
-        console_namespace, method, client, current_client
+        self,
+        filename,
+        wdir,
+        args,
+        post_mortem,
+        clear_variables,
+        console_namespace,
+        method,
+        client,
+        current_client
     ):
         if method is None:
             method = "runfile"
@@ -2588,7 +2608,6 @@ def norm(text):
                 magic_arguments.append("--current-namespace")
 
             line = "%{} {}".format(method, shlex.join(magic_arguments))
-
         elif method in ["runfile", "debugfile"]:
             # External, non spyder-kernels, use %run
             magic_arguments = []
@@ -2601,9 +2620,11 @@ def norm(text):
             line = "%run " + shlex.join(magic_arguments)
         else:
             client.shellwidget.append_html_message(
-                _("The console is not running a Spyder-kernel, so it "
-                  "can't execute <b>{}</b>.<br><br>"
-                  "Please use a Spyder-kernel for this.").format(method),
+                _(
+                    "The console is not running a Spyder-kernel, so it can't "
+                    "execute <b>{}</b>.<br><br>"
+                    "Please use a Spyder-kernel for this."
+                ).format(method),
                 before_prompt=True
             )
             return

spyder/plugins/ipythonconsole/widgets/shell.py

@@ -749,9 +749,11 @@ def set_color_scheme(self, color_scheme, reset=True):
         self.set_bracket_matcher_color_scheme(color_scheme)
         self.style_sheet, dark_color = create_qss_style(color_scheme)
         self.syntax_style = color_scheme
+
         if not self.spyder_kernel_ready:
             # Will be sent later
             return
+
         if reset:
             # Don't clear console and show a message instead to prevent
             # removing important content from users' consoles.

spyder/plugins/pythonpath/utils.py

@@ -7,6 +7,7 @@
 """
 Pythonpath manager utils.
 """
+
 # Standard library imports
 import os
 import os.path as osp

spyder/plugins/pythonpath/widgets/pathmanager.py

@@ -18,8 +18,15 @@
 from qtpy.QtCore import QSize, Qt, Signal, Slot
 from qtpy.QtGui import QFontMetrics
 from qtpy.QtWidgets import (
-    QDialog, QDialogButtonBox, QHBoxLayout, QLabel, QListWidget,
-    QListWidgetItem, QMessageBox, QStackedWidget, QVBoxLayout
+    QDialog,
+    QDialogButtonBox,
+    QHBoxLayout,
+    QLabel,
+    QListWidget,
+    QListWidgetItem,
+    QMessageBox,
+    QStackedWidget,
+    QVBoxLayout,
 )
 
 # Local imports
@@ -29,7 +36,9 @@
 from spyder.config.base import _
 from spyder.plugins.pythonpath.utils import check_path, get_system_pythonpath
 from spyder.utils.environ import (
-    get_user_environment_variables, get_user_env, set_user_env
+    get_user_environment_variables,
+    get_user_env,
+    set_user_env,
 )
 from spyder.utils.misc import getcwd_or_home
 from spyder.utils.stylesheet import (
@@ -100,7 +109,6 @@ def __init__(self, parent, sync=True):
         # Create a loading message
         self.loading_pane = EmptyMessageWidget(
             parent=self,
-            icon_filename="dependencies",
             text=_("Retrieving environment variables..."),
             bottom_stretch=1,
             spinner=True,

spyder/utils/environ.py

@@ -305,6 +305,7 @@ def __init__(self, parent=None):
         if os.name == 'nt':
             title = _(r"User environment variables in Windows registry")
             readonly = False
+
         super().__init__(parent=parent, title=title, readonly=readonly)
 
         if os.name == 'nt':

spyder/widgets/collectionseditor.py

@@ -31,8 +31,13 @@
 # Third party imports
 from qtpy.compat import getsavefilename, to_qvariant
 from qtpy.QtCore import (
-    QAbstractTableModel, QItemSelectionModel, QModelIndex, Qt, QTimer,
-    Signal, Slot
+    QAbstractTableModel,
+    QItemSelectionModel,
+    QModelIndex,
+    Qt,
+    QTimer,
+    Signal,
+    Slot
 )
 from qtpy.QtGui import QColor, QKeySequence
 from qtpy.QtWidgets import (
@@ -1939,7 +1944,9 @@ class CollectionsEditor(BaseDialog):
     """Collections Editor Dialog"""
 
     def __init__(
-        self, parent=None, namespacebrowser=None,
+        self,
+        parent=None,
+        namespacebrowser=None,
         data_function: Optional[Callable[[], Any]] = None,
     ):
         super().__init__(parent)
@@ -1960,8 +1967,15 @@ def __init__(
         self.loading_pane = None
 
     def setup(
-        self, data, title='', readonly=False, remote=False,
-        icon=None, parent=None, loading_msg=None, loading_img=None
+        self,
+        data,
+        title='',
+        readonly=False,
+        remote=False,
+        icon=None,
+        parent=None,
+        loading_msg=None,
+        loading_img=None,
     ):
         """Setup editor."""
         if isinstance(data, (dict, set, frozenset)):
@@ -2012,7 +2026,6 @@ def setup(
 
         # Create a QStackedWidget
         self.stacked_widget = QStackedWidget()
-
         self.stacked_widget.addWidget(self.widget)
 
         # Create a loading message