gui: isort

Change-Id: Ic1c1d54a9577c1774024aefd5464b6e4b8e1fe07
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30570
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>

.isort.cfg

@@ -0,0 +1,8 @@
+[settings]
+multi_line_output=2
+combine_as_imports=True
+
+known_qt=frappy.gui.qt
+known_core=frappy
+
+sections=FUTURE,STDLIB,QT,THIRDPARTY,CORE,LOCALFOLDER

frappy/gui/cfg_editor/config_file.py

@@ -26,8 +26,8 @@ from configparser import NoOptionError
 
 from frappy.gui.cfg_editor.tree_widget_item import TreeWidgetItem
 from frappy.gui.cfg_editor.utils import get_all_children_with_names, \
-    get_all_items, get_interface_class_from_name, \
-    get_module_class_from_name, get_params, get_props
+    get_all_items, get_interface_class_from_name, get_module_class_from_name, \
+    get_params, get_props
 
 NODE = 'node'
 INTERFACE = 'interface'

frappy/gui/cfg_editor/mainwindow.py

@@ -22,10 +22,11 @@
 
 import os
 
+from frappy.gui.qt import QMainWindow, QMessageBox
+
 from frappy.gui.cfg_editor.node_display import NodeDisplay
 from frappy.gui.cfg_editor.utils import get_file_paths, loadUi
 from frappy.gui.cfg_editor.widgets import TabBar
-from frappy.gui.qt import QMainWindow, QMessageBox
 
 # TODO move frappy mainwindow to gui/client and all specific stuff
 NODE = 'node'

frappy/gui/cfg_editor/node_display.py

@@ -20,9 +20,10 @@
 #
 # *****************************************************************************
 
-from frappy.gui.cfg_editor.utils import loadUi
 from frappy.gui.qt import QHBoxLayout, QSizePolicy, QSpacerItem, Qt, QWidget
 
+from frappy.gui.cfg_editor.utils import loadUi
+
 
 class NodeDisplay(QWidget):
     def __init__(self, file_path=None, parent=None):

frappy/gui/cfg_editor/tree_widget_item.py

@@ -20,11 +20,12 @@
 #
 # *****************************************************************************
 
-from frappy.gui.cfg_editor.utils import loadUi, \
-    set_name_edit_style, setIcon, setTreeIcon
-from frappy.gui.qt import QDialog, QFont, QHBoxLayout, \
-    QLabel, QPushButton, QSize, QSizePolicy, QTextEdit, \
-    QTreeWidgetItem, QVBoxLayout, QWidget, pyqtSignal
+from frappy.gui.qt import QDialog, QFont, QHBoxLayout, QLabel, QPushButton, \
+    QSize, QSizePolicy, QTextEdit, QTreeWidgetItem, QVBoxLayout, QWidget, \
+    pyqtSignal
+
+from frappy.gui.cfg_editor.utils import loadUi, set_name_edit_style, setIcon, \
+    setTreeIcon
 from frappy.gui.valuewidgets import get_widget
 from frappy.properties import Property
 

frappy/gui/cfg_editor/utils.py

@@ -25,6 +25,7 @@ import sys
 from os import listdir, path
 
 from frappy.gui.qt import QDialogButtonBox, QFileDialog, QIcon, QSize, uic
+
 from frappy.modules import Module
 from frappy.params import Parameter
 from frappy.properties import Property

frappy/gui/cfg_editor/widgets.py

@@ -23,15 +23,16 @@
 
 import os
 
+from frappy.gui.qt import QComboBox, QDialog, QDialogButtonBox, QLabel, \
+    QLineEdit, QMenu, QPoint, QSize, QStandardItem, QStandardItemModel, Qt, \
+    QTabBar, QTextEdit, QTreeView, QTreeWidget, pyqtSignal
+
 from frappy.gui.cfg_editor.config_file import read_config, write_config
 from frappy.gui.cfg_editor.tree_widget_item import TreeWidgetItem
-from frappy.gui.cfg_editor.utils import get_all_items, \
-    get_file_paths, get_interface_class_from_name, get_interfaces, \
-    get_module_class_from_name, get_modules, get_params, \
-    get_props, loadUi, set_name_edit_style, setActionIcon
-from frappy.gui.qt import QComboBox, QDialog, QDialogButtonBox, QLabel, \
-    QLineEdit, QMenu, QPoint, QSize, QStandardItem, QStandardItemModel, \
-    Qt, QTabBar, QTextEdit, QTreeView, QTreeWidget, pyqtSignal
+from frappy.gui.cfg_editor.utils import get_all_items, get_file_paths, \
+    get_interface_class_from_name, get_interfaces, \
+    get_module_class_from_name, get_modules, get_params, get_props, loadUi, \
+    set_name_edit_style, setActionIcon
 
 NODE = 'node'
 MODULE = 'module'

frappy/gui/collapsible.py

@@ -1,4 +1,6 @@
-from frappy.gui.qt import QToolButton, QFrame, QWidget, QGridLayout, QSizePolicy, QVBoxLayout, Qt
+from frappy.gui.qt import QFrame, QGridLayout, QSizePolicy, Qt, QToolButton, \
+    QVBoxLayout, QWidget
+
 
 class CollapsibleWidget(QWidget):
     def __init__(self, parent=None):

frappy/gui/connection.py

@@ -21,8 +21,9 @@
 #
 # *****************************************************************************
 
-import frappy.client
 from frappy.gui.qt import QObject, pyqtSignal
+
+import frappy.client
 from frappy.gui.util import Value
 
 

frappy/gui/logwindow.py

@@ -1,8 +1,8 @@
-from logging import Handler, DEBUG, NOTSET
+from logging import DEBUG, NOTSET, Handler
 
 from frappy.gui.qt import QMainWindow, QObject, pyqtSignal
-from frappy.gui.util import loadUi
 
+from frappy.gui.util import loadUi
 
 
 class LogWindowHandler(Handler, QObject):

frappy/gui/mainwindow.py

@@ -21,15 +21,16 @@
 #
 # *****************************************************************************
 
+from frappy.gui.qt import QAction, QInputDialog, QKeySequence, QMainWindow, \
+    QMessageBox, QSettings, QShortcut, QTreeWidgetItem, QWidget, pyqtSignal, \
+    pyqtSlot
+
 import frappy.version
-from frappy.gui.qt import QInputDialog, QMainWindow, QMessageBox, \
-        QTreeWidgetItem, pyqtSignal, pyqtSlot, QWidget, QSettings, QAction, \
-        QShortcut, QKeySequence
-from frappy.gui.util import Colors, loadUi
-from frappy.gui.logwindow import LogWindow
-from frappy.gui.tabwidget import TearOffTabWidget
-from frappy.gui.nodewidget import NodeWidget
 from frappy.gui.connection import QSECNode
+from frappy.gui.logwindow import LogWindow
+from frappy.gui.nodewidget import NodeWidget
+from frappy.gui.tabwidget import TearOffTabWidget
+from frappy.gui.util import Colors, loadUi
 
 ITEM_TYPE_NODE = QTreeWidgetItem.UserType + 1
 ITEM_TYPE_GROUP = QTreeWidgetItem.UserType + 2

frappy/gui/modulectrl.py

@@ -23,9 +23,10 @@
 # *****************************************************************************
 
 
+from frappy.gui.qt import QCheckBox, QDialog, QLabel, QMessageBox, \
+    QPushButton, QSizePolicy, QWidget
+
 from frappy.gui.params import ParameterView
-from frappy.gui.qt import QCheckBox, QDialog, QLabel, \
-    QMessageBox, QPushButton, QSizePolicy, QWidget
 from frappy.gui.util import loadUi
 from frappy.gui.valuewidgets import get_widget
 

frappy/gui/moduleoverview.py

@@ -1,5 +1,7 @@
+from frappy.gui.qt import QIcon, Qt, QTreeWidget, QTreeWidgetItem, pyqtSignal
+
 import frappy.gui.resources  # pylint: disable=unused-import
-from frappy.gui.qt import QTreeWidget, QTreeWidgetItem, pyqtSignal, QIcon, Qt
+
 
 class ParamItem(QTreeWidgetItem):
     def __init__(self, node, module, param):

frappy/gui/modulewidget.py

@@ -1,8 +1,10 @@
-from frappy.gui.qt import QLabel, QMessageBox, QWidget, QLineEdit, \
-        QPushButton, QIcon, pyqtSignal, QToolButton, QDialog
+from frappy.gui.qt import QDialog, QIcon, QLabel, QLineEdit, QMessageBox, \
+    QPushButton, QToolButton, QWidget, pyqtSignal
+
+import frappy.gui.resources  # pylint: disable=unused-import
 from frappy.gui.util import loadUi
 from frappy.gui.valuewidgets import get_widget
-import frappy.gui.resources # pylint: disable=unused-import
+
 
 class CommandDialog(QDialog):
     def __init__(self, cmdname, argument, parent=None):

frappy/gui/nodewidget.py

@@ -1,18 +1,19 @@
-from collections import OrderedDict
 import json
+from collections import OrderedDict
+
+from frappy.gui.qt import QCursor, QFont, QFontMetrics, QGridLayout, QIcon, \
+    QInputDialog, QLabel, QMenu, QPlainTextEdit, QTextCursor, QVBoxLayout, \
+    QWidget, pyqtSignal, pyqtSlot, toHtmlEscaped
 
 import frappy.gui.resources  # pylint: disable=unused-import
-from frappy.gui.qt import QFont, QFontMetrics, QLabel, QTextCursor, QWidget, \
-        pyqtSlot, toHtmlEscaped, QVBoxLayout, QGridLayout, QPlainTextEdit, \
-        QMenu, QCursor, QIcon, QInputDialog, pyqtSignal
-from frappy.gui.util import Colors, loadUi
-from frappy.gui.plotting import getPlotWidget
-from frappy.gui.modulectrl import ModuleCtrl
-from frappy.gui.paramview import ParameterView
-from frappy.gui.modulewidget import ModuleWidget
-from frappy.gui.moduleoverview import ModuleOverview
-
 from frappy.errors import SECoPError
+from frappy.gui.modulectrl import ModuleCtrl
+from frappy.gui.moduleoverview import ModuleOverview
+from frappy.gui.modulewidget import ModuleWidget
+from frappy.gui.paramview import ParameterView
+from frappy.gui.plotting import getPlotWidget
+from frappy.gui.util import Colors, loadUi
+
 
 class Console(QWidget):
     def __init__(self, node, parent=None):

frappy/gui/params/__init__.py

@@ -22,8 +22,9 @@
 # *****************************************************************************
 
 
-from frappy.datatypes import EnumType
 from frappy.gui.qt import QWidget, pyqtSignal, pyqtSlot
+
+from frappy.datatypes import EnumType
 from frappy.gui.util import loadUi
 
 

frappy/gui/paramview.py

@@ -23,6 +23,7 @@
 
 
 from frappy.gui.qt import QLabel, QSizePolicy, QWidget
+
 from frappy.gui.util import loadUi
 
 

frappy/gui/plotting.py

@@ -1,14 +1,15 @@
 import time
 
 try:
-    import pyqtgraph as pg
     import numpy as np
+    import pyqtgraph as pg
 except ImportError:
     pg = None
     np = None
 
+from frappy.gui.qt import QLabel, Qt, QVBoxLayout, QWidget, pyqtSignal
+
 from frappy.gui.util import Colors
-from frappy.gui.qt import QWidget, QVBoxLayout, QLabel, Qt, pyqtSignal
 
 
 def getPlotWidget(parent):

frappy/gui/qt.py

@@ -30,35 +30,39 @@ try:
     # pylint: disable=unnecessary-lambda
     sys.excepthook = lambda *args: sys.__excepthook__(*args)
 
-    from PyQt5 import uic
-    from PyQt5.QtCore import Qt, QObject, pyqtSignal, pyqtSlot, QSize, QPointF, \
-        QRectF, QPoint, QByteArray, QEvent, QMimeData, QSettings
-    from PyQt5.QtGui import QFont, QTextCursor, QFontMetrics, QColor, QBrush, \
-        QPainter, QPolygonF, QPen, QIcon, QStandardItemModel, QStandardItem, \
-        QPalette, QCursor, QDrag, QMouseEvent, QPixmap, QKeySequence
-    from PyQt5.QtWidgets import QLabel, QWidget, QDialog, QLineEdit, QCheckBox, \
-        QPushButton, QSizePolicy, QMainWindow, QMessageBox, QInputDialog, \
-        QTreeWidgetItem, QApplication, QGroupBox, QSpinBox, QDoubleSpinBox, \
-        QComboBox, QRadioButton, QVBoxLayout, QHBoxLayout, QGridLayout, \
-        QScrollArea, QFrame, QTreeWidget, QFileDialog, QTabBar, QAction, QMenu,\
-        QDialogButtonBox, QTextEdit, QSpacerItem, QTreeView, QStyle, \
-        QStyleOptionTab, QStylePainter, QTabWidget, QToolButton, QShortcut, \
-        QPlainTextEdit
-
     from xml.sax.saxutils import escape as toHtmlEscaped
 
+    from PyQt5 import uic
+    from PyQt5.QtCore import QByteArray, QEvent, QMimeData, QObject, QPoint, \
+        QPointF, QRectF, QSettings, QSize, Qt, pyqtSignal, pyqtSlot
+    from PyQt5.QtGui import QBrush, QColor, QCursor, QDrag, QFont, \
+        QFontMetrics, QIcon, QKeySequence, QMouseEvent, QPainter, QPalette, \
+        QPen, QPixmap, QPolygonF, QStandardItem, QStandardItemModel, \
+        QTextCursor
+    from PyQt5.QtWidgets import QAction, QApplication, QCheckBox, QComboBox, \
+        QDialog, QDialogButtonBox, QDoubleSpinBox, QFileDialog, QFrame, \
+        QGridLayout, QGroupBox, QHBoxLayout, QInputDialog, QLabel, QLineEdit, \
+        QMainWindow, QMenu, QMessageBox, QPlainTextEdit, QPushButton, \
+        QRadioButton, QScrollArea, QShortcut, QSizePolicy, QSpacerItem, \
+        QSpinBox, QStyle, QStyleOptionTab, QStylePainter, QTabBar, \
+        QTabWidget, QTextEdit, QToolButton, QTreeView, QTreeWidget, \
+        QTreeWidgetItem, QVBoxLayout, QWidget
+
     import frappy.gui.cfg_editor.icon_rc_qt5
 
 except ImportError:
     from PyQt4 import uic
-    from PyQt4.QtCore import Qt, QObject, pyqtSignal, pyqtSlot, QSize, QPointF, QRectF, QPoint
-    from PyQt4.QtGui import QFont, QTextCursor, QFontMetrics, \
-        QLabel, QWidget, QDialog, QLineEdit, QCheckBox, QPushButton, QTextEdit,\
-        QSizePolicy, QMainWindow, QMessageBox, QInputDialog, QTreeWidgetItem, QApplication, \
-        QGroupBox, QSpinBox, QDoubleSpinBox, QComboBox, QRadioButton, QVBoxLayout, QHBoxLayout, \
-        QGridLayout, QScrollArea, QFrame, QColor, QBrush, QPainter, QPolygonF, QPen, QIcon, \
-        QTreeWidget, QFileDialog, QTabBar, QAction, QMenu, QDialogButtonBox, QAbstractItemView, \
-        QSpacerItem, QTreeView, QStandardItemModel, QStandardItem, QPlainTextEdit
+    from PyQt4.QtCore import QObject, QPoint, QPointF, QRectF, QSize, Qt, \
+        pyqtSignal, pyqtSlot
+    from PyQt4.QtGui import QAbstractItemView, QAction, QApplication, QBrush, \
+        QCheckBox, QColor, QComboBox, QDialog, QDialogButtonBox, \
+        QDoubleSpinBox, QFileDialog, QFont, QFontMetrics, QFrame, \
+        QGridLayout, QGroupBox, QHBoxLayout, QIcon, QInputDialog, QLabel, \
+        QLineEdit, QMainWindow, QMenu, QMessageBox, QPainter, QPen, \
+        QPlainTextEdit, QPolygonF, QPushButton, QRadioButton, QScrollArea, \
+        QSizePolicy, QSpacerItem, QSpinBox, QStandardItem, \
+        QStandardItemModel, QTabBar, QTextCursor, QTextEdit, QTreeView, \
+        QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 
     import frappy.gui.cfg_editor.icon_rc_qt4
 

frappy/gui/tabwidget.py

@@ -24,11 +24,9 @@
 
 """Detachable TabWidget, taken from NICOS GUI TearOffTabBar."""
 
-from frappy.gui.qt import QApplication, QCursor, QDrag, \
-    QEvent, QMainWindow, QMimeData, QMouseEvent, QPixmap, QPoint, QSize, \
-    QStyle, QStyleOptionTab, QStylePainter, Qt, QTabBar, QTabWidget, QWidget, \
-    pyqtSignal, pyqtSlot
-
+from frappy.gui.qt import QApplication, QCursor, QDrag, QEvent, QMainWindow, \
+    QMimeData, QMouseEvent, QPixmap, QPoint, QSize, QStyle, QStyleOptionTab, \
+    QStylePainter, Qt, QTabBar, QTabWidget, QWidget, pyqtSignal, pyqtSlot
 
 # def findTab(tab, w):
 #     widget = w

frappy/gui/util.py

@@ -24,7 +24,7 @@
 
 from os import path
 
-from frappy.gui.qt import uic, QColor
+from frappy.gui.qt import QColor, uic
 
 uipath = path.dirname(__file__)
 

frappy/gui/valuewidgets.py

@@ -22,14 +22,14 @@
 # *****************************************************************************
 
 
+from frappy.gui.qt import QCheckBox, QComboBox, QDialog, QDoubleSpinBox, \
+    QFrame, QGridLayout, QGroupBox, QLabel, QLineEdit, QSpinBox, QTextEdit, \
+    QVBoxLayout
+
 from frappy.datatypes import ArrayOf, BLOBType, BoolType, EnumType, \
     FloatRange, IntRange, StringType, StructOf, TextType, TupleOf
-from frappy.gui.qt import QCheckBox, QComboBox, QDialog, \
-    QDoubleSpinBox, QFrame, QGridLayout, QGroupBox, \
-    QLabel, QLineEdit, QSpinBox, QTextEdit, QVBoxLayout
 from frappy.gui.util import loadUi
 
-
 # XXX: implement live validators !!!!
 # XXX: signals upon change of value
 # XXX: honor readonly in all cases!