Style corrections after Sandor's work

Author: ccordoba12

spyderlib/plugins/__init__.py

@@ -18,10 +18,15 @@
 # pylint: disable=R0911
 # pylint: disable=R0201
 
+# Qt imports
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QDockWidget, QWidget, QShortcut, QCursor,
                                 QKeySequence, QMainWindow, QApplication)
 from spyderlib.qt.QtCore import Qt, Signal
 
+# Stdlib imports
+import sys
+
 # Local imports
 from spyderlib.utils.qthelpers import toggle_actions, get_icon, create_action
 from spyderlib.baseconfig import _
@@ -30,8 +35,6 @@
 from spyderlib.guiconfig import get_font, set_font
 from spyderlib.plugins.configdialog import SpyderConfigPage
 from spyderlib.py3compat import configparser, is_text_string
-import sys
-from spyderlib.qt import PYQT5
 
 
 class PluginConfigPage(SpyderConfigPage):
@@ -182,8 +185,7 @@ def __init__(self, main = None, **kwds):
         # We decided to create our own toggle action instead of using
         # the one that comes with dockwidget because it's not possible
         # to raise and focus the plugin with it.
-        self.toggle_view_action = None
- 
+        self.toggle_view_action = None 
 
     def initialize_plugin(self):
         """Initialize plugin: connect signals, setup actions, ..."""
@@ -354,7 +356,6 @@ def set_plugin_font(self, font, option=None):
         """Set plugin font option"""
         set_font(font, self.CONF_SECTION, option)
 
-        
     def __show_message(self, message, timeout=0):
         """Show message in main window's status bar"""
         self.main.statusBar().showMessage(message, timeout)
@@ -418,14 +419,14 @@ class SpyderPluginWidget(QWidget, SpyderPluginMixin):
     sig_option_changed = Signal(str, object)
     show_message = Signal(str, int)
     update_plugin_title = Signal()
+
     if PYQT5:
         def __init__(self, parent, **kwds):
             super().__init__(**kwds)
     else:    
         def __init__(self, parent):
             QWidget.__init__(self, parent)
             SpyderPluginMixin.__init__(self, parent)
-
 
     def get_plugin_title(self):
         """

spyderlib/plugins/console.py

@@ -11,6 +11,7 @@
 # pylint: disable=R0911
 # pylint: disable=R0201
 
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QVBoxLayout, QFontDialog, QInputDialog,
                                 QLineEdit, QMenu)
 from spyderlib.qt.QtCore import Signal, Slot
@@ -34,8 +35,7 @@
 from spyderlib.plugins import SpyderPluginWidget
 from spyderlib.py3compat import to_text_string, getcwd
 
-from spyderlib.qt import PYQT5
-    
+
 class Console(SpyderPluginWidget):
     """
     Console widget
@@ -47,7 +47,6 @@ class Console(SpyderPluginWidget):
     show_message = Signal(str, int)
     update_plugin_title = Signal()
 
-
     def __init__(self, parent=None, namespace=None, commands=[], message=None,
                  exitfunc=None, profile=False, multithreaded=False):
         if PYQT5:
@@ -69,7 +68,6 @@ def __init__(self, parent=None, namespace=None, commands=[], message=None,
         self.shell.go_to_error.connect(self.go_to_error)
         self.shell.focus_changed.connect(lambda: self.focus_changed.emit())
 
-
         # Redirecting some signals:
         self.shell.redirect_stdio.connect(lambda state:
                                           self.redirect_stdio.emit(state))
@@ -94,7 +92,6 @@ def __init__(self, parent=None, namespace=None, commands=[], message=None,
 
         # Accepting drops
         self.setAcceptDrops(True)
-
 
     #------ Private API --------------------------------------------------------
     def set_historylog(self, historylog):

spyderlib/plugins/editor.py

@@ -11,6 +11,7 @@
 # pylint: disable=R0911
 # pylint: disable=R0201
 
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QVBoxLayout, QPrintDialog, QSplitter, QToolBar,
                                 QAction, QApplication, QDialog, QWidget,
                                 QPrinter, QActionGroup, QInputDialog, QMenu,
@@ -45,7 +46,6 @@
                                          get_run_configuration,
                                          ALWAYS_OPEN_FIRST_RUN_OPTION)
 from spyderlib.py3compat import to_text_string, getcwd, qbytearray_to_str
-from spyderlib.qt import PYQT5
 
 
 def _load_all_breakpoints():
@@ -342,7 +342,6 @@ class Editor(SpyderPluginWidget):
     run_in_current_extconsole = Signal(str, str, str, bool)
     show_message = Signal(str, int)
     update_plugin_title = Signal()
-
 
     def __init__(self, parent, ignore_last_opened_files=False):
         if PYQT5:
@@ -2000,12 +1999,9 @@ def debug_command(self, command):
                 self.main.extconsole.execute_python_code(command)
             else:
                 self.main.ipyconsole.write_to_stdin(command)
-
                 focus_widget = self.main.ipyconsole.get_focus_widget()
-
                 if focus_widget:
                     focus_widget.setFocus()
-
         else:
             self.main.extconsole.execute_python_code(command)
 

spyderlib/plugins/explorer.py

@@ -37,7 +37,6 @@ class Explorer(ExplorerWidget, SpyderPluginMixin):
     open_dir = Signal(str)
     show_message = Signal(str, int)
     update_plugin_title = Signal()
-
 
     def __init__(self, parent=None):
         ExplorerWidget.__init__(self, parent=parent,

spyderlib/plugins/externalconsole.py

@@ -12,6 +12,7 @@
 # pylint: disable=R0201
 
 # Qt imports
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QVBoxLayout, QMessageBox, QInputDialog,
                                 QLineEdit, QPushButton, QGroupBox, QLabel,
                                 QTabWidget, QFontComboBox, QHBoxLayout,
@@ -41,7 +42,6 @@
 from spyderlib.plugins.runconfig import get_run_configuration
 from spyderlib.py3compat import to_text_string, is_text_string, getcwd
 from spyderlib import dependencies
-from spyderlib.qt import PYQT5
 
 MPL_REQVER = '>=1.0'
 dependencies.add("matplotlib", _("Interactive data plotting in the consoles"),
@@ -453,7 +453,6 @@ class ExternalConsole(SpyderPluginWidget):
     show_message = Signal(str, int)
     update_plugin_title = Signal()
     go_to_error = Signal(str)
-
 
     def __init__(self, parent, light_mode):
         if PYQT5:

spyderlib/plugins/findinfiles.py

@@ -31,7 +31,6 @@ class FindInFiles(FindInFilesWidget, SpyderPluginMixin):
     redirect_stdio = Signal(bool)
     show_message = Signal(str, int)
     update_plugin_title = Signal()
-
 
     def __init__(self, parent=None):
         supported_encodings = self.get_option('supported_encodings')

spyderlib/plugins/history.py

@@ -6,6 +6,7 @@
 
 """Console History Plugin"""
 
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QVBoxLayout, QFontDialog, QInputDialog,
                                 QToolButton, QMenu, QFontComboBox, QGroupBox)
 from spyderlib.qt.QtCore import Signal, Slot
@@ -24,7 +25,6 @@
 from spyderlib.widgets.findreplace import FindReplace
 from spyderlib.plugins import SpyderPluginWidget, PluginConfigPage
 from spyderlib.py3compat import to_text_string, is_text_string
-from spyderlib.qt import PYQT5
 
 
 class HistoryConfigPage(PluginConfigPage):

spyderlib/plugins/inspector.py

@@ -6,6 +6,7 @@
 
 """Object Inspector Plugin"""
 
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QHBoxLayout, QVBoxLayout, QLabel, QSizePolicy,
                                 QMenu, QToolButton, QGroupBox, QFontComboBox,
                                 QActionGroup, QFontDialog, QWidget, QComboBox,
@@ -34,7 +35,6 @@
 from spyderlib.widgets.externalshell.pythonshell import ExtPythonShellWidget
 from spyderlib.plugins import SpyderPluginWidget, PluginConfigPage
 from spyderlib.py3compat import to_text_string, get_meth_class_inst
-from spyderlib.qt import PYQT5
 
 #XXX: Hardcoded dependency on optional IPython plugin component
 #     that requires the hack to make this work without IPython
@@ -352,12 +352,11 @@ class ObjectInspector(SpyderPluginWidget):
     CONF_SECTION = 'inspector'
     CONFIGWIDGET_CLASS = ObjectInspectorConfigPage
     LOG_PATH = get_conf_path(CONF_SECTION)
-    # Signals
+
     focus_changed = Signal()
     show_message = Signal(str, int)
     update_plugin_title = Signal()
-    focus_changed = Signal()
-    
+    focus_changed = Signal()    
 
     def __init__(self, parent):
         if PYQT5:
@@ -378,7 +377,6 @@ def __init__(self, parent):
         self.set_default_color_scheme()
 
         self.plain_text = PlainText(self)
-
         self.rich_text = RichText(self)
 
         color_scheme = get_color_scheme(self.get_option('color_scheme_name'))

spyderlib/plugins/ipythonconsole.py

@@ -21,6 +21,7 @@
 import sys
 
 # Qt imports
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QVBoxLayout, QHBoxLayout, QFormLayout, 
                                 QMessageBox, QGroupBox, QDialogButtonBox,
                                 QDialog, QTabWidget, QFontComboBox, 
@@ -59,7 +60,6 @@
 from spyderlib.widgets.findreplace import FindReplace
 from spyderlib.plugins import SpyderPluginWidget, PluginConfigPage
 from spyderlib.py3compat import to_text_string, u
-from spyderlib.qt import PYQT5
 
 
 SYMPY_REQVER = '>=0.7.0'

spyderlib/plugins/projectexplorer.py

@@ -20,6 +20,7 @@
 class ProjectExplorer(ProjectExplorerWidget, SpyderPluginMixin):
     """Project explorer plugin"""
     CONF_SECTION = 'project_explorer'
+
     open_terminal = Signal(str)
     open_interpreter = Signal(str)
     pythonpath_changed = Signal()
@@ -32,7 +33,6 @@ class ProjectExplorer(ProjectExplorerWidget, SpyderPluginMixin):
     redirect_stdio = Signal(bool)
     show_message = Signal(str, int)
     update_plugin_title = Signal()
-
 
     def __init__(self, parent=None):
         ProjectExplorerWidget.__init__(self, parent=parent,

spyderlib/plugins/shortcuts.py

@@ -216,7 +216,6 @@ def reset(self):
         self.endResetModel()
 
 
-
 class ShortcutsDelegate(QItemDelegate):
     def __init__(self, parent=None):
         QItemDelegate.__init__(self, parent)

spyderlib/plugins/workingdirectory.py

@@ -11,6 +11,7 @@
 # pylint: disable=R0911
 # pylint: disable=R0201
 
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QToolBar, QLabel, QGroupBox, QVBoxLayout,
                                 QHBoxLayout, QButtonGroup)
 from spyderlib.qt.QtCore import Signal, Slot
@@ -29,7 +30,6 @@
 from spyderlib.plugins import SpyderPluginMixin, PluginConfigPage
 from spyderlib.py3compat import to_text_string, getcwd
 
-from spyderlib.qt import PYQT5
 
 class WorkingDirectoryConfigPage(PluginConfigPage):
     def setup_page(self):
@@ -141,6 +141,7 @@ class WorkingDirectory(QToolBar, SpyderPluginMixin):
     CONF_SECTION = 'workingdir'
     CONFIGWIDGET_CLASS = WorkingDirectoryConfigPage
     LOG_PATH = get_conf_path(CONF_SECTION)
+
     sig_option_changed = Signal(str, object)
     set_previous_enabled = Signal(bool)
     set_next_enabled = Signal(bool)
@@ -150,7 +151,6 @@ class WorkingDirectory(QToolBar, SpyderPluginMixin):
     set_current_console_wd = Signal(str)
     show_message = Signal(str, int)
     update_plugin_title = Signal()
-
 
     def __init__(self, parent, workdir=None, **kwds):
         if PYQT5:
@@ -159,7 +159,6 @@ def __init__(self, parent, workdir=None, **kwds):
             QToolBar.__init__(self, parent)
             SpyderPluginMixin.__init__(self, parent)
 
-
         # Initialize plugin
         self.initialize_plugin()
 

spyderlib/widgets/arrayeditor.py

@@ -321,7 +321,6 @@ def reset(self):
         self.endResetModel()
 
 
-
 class ArrayDelegate(QItemDelegate):
     """Array Editor Item Delegate"""
     def __init__(self, dtype, parent=None):

spyderlib/widgets/dataframeeditor.py

@@ -360,7 +360,6 @@ def reset(self):
         self.endResetModel()
 
 
-
 class DataFrameView(QTableView):
     """Data Frame view class"""
     def __init__(self, parent, model):

spyderlib/widgets/dependencies.py

@@ -95,7 +95,6 @@ def reset(self):
         self.endResetModel()
 
 
-
 class DependenciesDelegate(QItemDelegate):
     def __init__(self, parent=None):
         QItemDelegate.__init__(self, parent)

spyderlib/widgets/dicteditor.py

@@ -218,7 +218,6 @@ def sort(self, column, order=Qt.AscendingOrder):
         self.beginResetModel()
         self.endResetModel()
 
-
     def columnCount(self, qindex=QModelIndex()):
         """Array column number"""
         return 4
@@ -319,7 +318,6 @@ def reset(self):
         self.beginResetModel()
         self.endResetModel()
 
-
 class DictModel(ReadOnlyDictModel):
     """DictEditor Table Model"""
 

spyderlib/widgets/externalshell/pythonshell.py

@@ -40,7 +40,6 @@ class ExtPythonShellWidget(PythonShellWidget):
     wait_for_ready_read = Signal()
     go_to_error = Signal(str)
     focus_changed = Signal()
-
 
     def __init__(self, parent, history_filename, profile=False):
         PythonShellWidget.__init__(self, parent, history_filename, profile)

spyderlib/widgets/externalshell/sitecustomize.py

@@ -362,7 +362,6 @@ def __init__(self, *args, **kwargs):
             kwargs['testRunner'] = kwargs.pop('testRunner', test_runner)
             kwargs['exit'] = False
             TestProgram.__init__(self, *args, **kwargs)
-
     unittest.main = IPyTesProgram
 
     # Pandas monkey-patches

spyderlib/widgets/externalshell/systemshell.py

@@ -9,8 +9,8 @@
 import os
 
 from spyderlib.qt.QtGui import QMessageBox
-from spyderlib.qt.QtCore import QProcess, Signal, QTextCodec
-from spyderlib.qt.QtCore import QProcessEnvironment
+from spyderlib.qt.QtCore import (QProcess, Signal, QTextCodec,
+                                 QProcessEnvironment)
 LOCALE_CODEC = QTextCodec.codecForLocale()
 CP850_CODEC = QTextCodec.codecForName('cp850')
 

spyderlib/widgets/projectexplorer.py

@@ -10,6 +10,7 @@
 
 from __future__ import print_function
 
+from spyderlib.qt import PYQT5
 from spyderlib.qt.QtGui import (QVBoxLayout, QLabel, QHBoxLayout, QWidget,
                                 QFileIconProvider, QMessageBox, QInputDialog,
                                 QLineEdit, QPushButton, QHeaderView,
@@ -31,7 +32,6 @@
 from spyderlib.widgets.formlayout import fedit
 from spyderlib.widgets.pathmanager import PathManager
 from spyderlib.py3compat import to_text_string, getcwd, pickle
-from spyderlib.qt import PYQT5
 
 
 def has_children_files(path, include, exclude, show_all):