further fixes of py3 issues

complaints by pylint are mainly related to
- remove object from base list in class definitions
- unnecessary else/elif after return/raise

Change-Id: I13d15449149cc8bba0562338d0c9c42e97163bdf
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21325
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>

secop/gui/cfg_editor/mainwindow.py

@@ -136,7 +136,7 @@ class MainWindow(QMainWindow):
             reply = self.show_save_message(self.tabWidget.tabText(index))
         if reply == QMessageBox.Cancel:
             return
-        elif reply == QMessageBox.Save:
+        if reply == QMessageBox.Save:
             self.save_tab(index)
         self.tabWidget.removeTab(index)
 
@@ -158,7 +158,7 @@ class MainWindow(QMainWindow):
             if reply == QMessageBox.Cancel:
                 event.ignore()
                 return
-            elif reply == QMessageBox.Save:
+            if reply == QMessageBox.Save:
                 for i in range(0, self.tabWidget.count()):
                     self.save_tab(i)
         event.accept()

secop/gui/cfg_editor/node_display.py

@@ -28,7 +28,7 @@ class NodeDisplay(QWidget):
     def __init__(self, file_path=None, parent=None):
         QWidget.__init__(self, parent)
         loadUi(self, 'node_display.ui')
-        self.saved = True if file_path else False
+        self.saved = bool(file_path)
         self.created = self.tree_widget.set_file(file_path)
         self.tree_widget.save_status_changed.connect(self.change_save_status)
         self.tree_widget.currentItemChanged.connect(self.set_scroll_area)

secop/gui/cfg_editor/widgets.py

@@ -104,8 +104,7 @@ class TreeWidget(QTreeWidget):
                 self.set_tree(read_config(self.file_path))
                 self.emit_save_status_changed(True)
                 return True
-            else:
-                self.file_path = None
+            self.file_path = None
         return self.new_tree()
 
     def new_tree(self):
@@ -391,7 +390,7 @@ class AddDialog(QDialog):
         if self.exec_() == QDialog.Accepted:
             if self.kind in [NODE, MODULE, INTERFACE]:
                 return [self.name.text(), self.get_value()]
-            elif self.kind in [PARAMETER, PROPERTY, COMMENT]:
+            if self.kind in [PARAMETER, PROPERTY, COMMENT]:
                 return [self.get_value()]
         return None
 

secop/gui/miniplot.py

@@ -44,7 +44,7 @@ _orange = QBrush(QColor('#ffa500'))
 
 my_uipath = path.dirname(__file__)
 
-class MiniPlotCurve(object):
+class MiniPlotCurve:
     # placeholder for data
     linecolor = _black
     linewidth = 0  # set to 0 to disable lines

secop/gui/nodectrl.py

@@ -25,6 +25,7 @@
 import json
 import pprint
 from time import sleep
+import mlzlog
 
 from secop.datatypes import EnumType, StringType
 from secop.errors import SECoPError
@@ -222,7 +223,6 @@ class ReadableWidget(QWidget):
         try:
             # if queried, we get the qualifiers as well, but don't want them
             # here
-            import mlzlog
             mlzlog.getLogger('cached values').warn(
                 'no cached value for %s:%s' % (self._module, pname))
             val = self._node.getParameter(self._module, pname)[0]