From 95d3094623f6f4a6c01bb7e146d462e61644730f Mon Sep 17 00:00:00 2001
From: Sven Sager <akira@narux.de>
Date: Sat, 18 Feb 2023 11:26:46 +0100
Subject: [PATCH] Bugfix in super call of backgroundworker.py

Change all super calls to default call with no arguments.
---
 setup.iss                              |  2 +-
 src/revpicommander/__init__.py         |  2 +-
 src/revpicommander/aclmanager.py       |  8 ++++----
 src/revpicommander/avahisearch.py      |  6 +++---
 src/revpicommander/backgroundworker.py |  8 ++++----
 src/revpicommander/debugcontrol.py     |  6 +++---
 src/revpicommander/debugios.py         |  2 +-
 src/revpicommander/helper.py           |  2 +-
 src/revpicommander/mqttmanager.py      |  8 ++++----
 src/revpicommander/revpicommander.py   |  2 +-
 src/revpicommander/revpifiles.py       |  4 ++--
 src/revpicommander/revpiinfo.py        |  4 ++--
 src/revpicommander/revpilogfile.py     |  8 ++++----
 src/revpicommander/revpioption.py      | 10 +++++-----
 src/revpicommander/revpiplclist.py     |  8 ++++----
 src/revpicommander/revpiprogram.py     | 10 +++++-----
 src/revpicommander/simulator.py        |  4 ++--
 src/revpicommander/sshauth.py          |  2 +-
 18 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/setup.iss b/setup.iss
index cae7539..919a98d 100644
--- a/setup.iss
+++ b/setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "RevPi Commander"
-#define MyAppVersion "0.9.10rc6"
+#define MyAppVersion "0.9.10rc7"
 #define MyAppPublisher "Sven Sager"
 #define MyAppURL "https://revpimodio.org/"
 #define MyAppICO "data\revpicommander.ico"
diff --git a/src/revpicommander/__init__.py b/src/revpicommander/__init__.py
index 633b4d6..3d67c8b 100644
--- a/src/revpicommander/__init__.py
+++ b/src/revpicommander/__init__.py
@@ -4,4 +4,4 @@ __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
 __license__ = "GPLv2"
 __package__ = "revpicommander"
-__version__ = "0.9.10rc6"
+__version__ = "0.9.10rc7"
diff --git a/src/revpicommander/aclmanager.py b/src/revpicommander/aclmanager.py
index 1c0ed68..348e264 100644
--- a/src/revpicommander/aclmanager.py
+++ b/src/revpicommander/aclmanager.py
@@ -16,7 +16,7 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
     """ACL manager."""
 
     def __init__(self, parent=None):
-        super(AclManager, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.setFixedSize(self.size())
 
@@ -91,7 +91,7 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
             return
 
         self.__oldacl = self.__table_to_acl()
-        super(AclManager, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         if self._changes_done():
@@ -107,12 +107,12 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
                 a0.ignore()
 
     def exec(self) -> int:
-        return super(AclManager, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Restore old settings."""
         self.setup_acl_manager(self.__oldacl, self.__dict_acltext)
-        super(AclManager, self).reject()
+        super().reject()
 
     def setup_acl_manager(self, acl_string: str, acl_texts: dict):
         if type(acl_string) != str:
diff --git a/src/revpicommander/avahisearch.py b/src/revpicommander/avahisearch.py
index 79981f6..9b7f6f4 100644
--- a/src/revpicommander/avahisearch.py
+++ b/src/revpicommander/avahisearch.py
@@ -24,7 +24,7 @@ class AvahiSearchThread(QtCore.QThread):
     updated = QtCore.pyqtSignal(str, str, int, str, str)
 
     def __init__(self, parent=None):
-        super(AvahiSearchThread, self).__init__(parent)
+        super().__init__(parent)
         self._cycle_wait_ms = 1000
 
         self.re_posix = compile(
@@ -71,7 +71,7 @@ class AvahiSearchThread(QtCore.QThread):
 class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
 
     def __init__(self, parent=None):
-        super(AvahiSearch, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         # Global variables to let parent decide other actions
@@ -184,7 +184,7 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
         self.connect_settings = None
         self.just_save = False
         self._restart_search()
-        rc = super(AvahiSearch, self).exec()
+        rc = super().exec()
         self._th_zero_conf.requestInterruption()
         return rc
 
diff --git a/src/revpicommander/backgroundworker.py b/src/revpicommander/backgroundworker.py
index 7b6d104..e1c599b 100644
--- a/src/revpicommander/backgroundworker.py
+++ b/src/revpicommander/backgroundworker.py
@@ -19,8 +19,8 @@ class BackgroundWorker(QtCore.QThread):
     status_message = QtCore.pyqtSignal(str)
 
     def __init__(self, parent=None, interruption_text: str = None):
+        super().__init__(parent)
         self._interruption_text = interruption_text or self.tr("User requested cancellation...")
-        super(BackgroundWorker, self).__init__(parent)
 
     def check_cancel(self) -> bool:
         """
@@ -73,9 +73,9 @@ class BackgroundWaiter(BackgroundWorker):
     """Just wait an amount of time and show progress bar."""
 
     def __init__(self, seconds: int, status_message: str, parent=None, interruption_text: str = None):
+        super().__init__(parent, interruption_text)
         self._status_message = status_message
         self._wait_steps = seconds * 4
-        super().__init__(parent, interruption_text)
 
     def run(self) -> None:
         log.debug("BackgroundWaiter.run")
@@ -101,7 +101,7 @@ class WorkerDialog(QtWidgets.QDialog, Ui_diag_backgroundworker):
         :param worker_thread: Thread with the logic work to do
         :param parent: QtWidget
         """
-        super(WorkerDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self._canceled = False
@@ -117,7 +117,7 @@ class WorkerDialog(QtWidgets.QDialog, Ui_diag_backgroundworker):
 
     def exec(self) -> int:
         self._th.start()
-        return super(WorkerDialog, self).exec()
+        return super().exec()
 
     @QtCore.pyqtSlot()
     def on_th_finished(self) -> None:
diff --git a/src/revpicommander/debugcontrol.py b/src/revpicommander/debugcontrol.py
index 236f63d..a31254f 100644
--- a/src/revpicommander/debugcontrol.py
+++ b/src/revpicommander/debugcontrol.py
@@ -26,7 +26,7 @@ class PsValues(QtCore.QThread):
     process_image_received = QtCore.pyqtSignal(Binary)
 
     def __init__(self):
-        super(PsValues, self).__init__()
+        super().__init__()
         self._cycle_time = 200
 
     def run(self):
@@ -55,7 +55,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
     """Debug controller for main window."""
 
     def __init__(self, parent=None):
-        super(DebugControl, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.dict_devices = {}
@@ -284,7 +284,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
         self.cbx_refresh.setChecked(False)
         self._destroy_io_view()
 
-        super(DebugControl, self).deleteLater()
+        super().deleteLater()
 
     def reload_devices(self):
         """Rebuild GUI depending on devices and ios of Revolution Pi."""
diff --git a/src/revpicommander/debugios.py b/src/revpicommander/debugios.py
index f0eadbf..26c81d1 100644
--- a/src/revpicommander/debugios.py
+++ b/src/revpicommander/debugios.py
@@ -22,7 +22,7 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
     search_class = (QtWidgets.QLineEdit, QtWidgets.QDoubleSpinBox, QtWidgets.QCheckBox)
 
     def __init__(self, position: int, name: str, inputs: list, outputs: list, parent=None):
-        super(DebugIos, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.restoreGeometry(helper.cm.settings.debug_geos.get(position, b''))
diff --git a/src/revpicommander/helper.py b/src/revpicommander/helper.py
index 5623de0..4b1a817 100644
--- a/src/revpicommander/helper.py
+++ b/src/revpicommander/helper.py
@@ -216,7 +216,7 @@ class ConnectionManager(QtCore.QThread):
     """After errors the connection is established again, could have other port information (SSH)."""
 
     def __init__(self, parent=None, cycle_time_ms=1000):
-        super(ConnectionManager, self).__init__(parent)
+        super().__init__(parent)
 
         self._cli = None
         self._cli_connect = Queue()
diff --git a/src/revpicommander/mqttmanager.py b/src/revpicommander/mqttmanager.py
index b2bd92d..c032884 100644
--- a/src/revpicommander/mqttmanager.py
+++ b/src/revpicommander/mqttmanager.py
@@ -15,7 +15,7 @@ class MqttManager(QtWidgets.QDialog, Ui_diag_mqtt):
     """MQTT settings for option window."""
 
     def __init__(self, parent=None):
-        super(MqttManager, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.setFixedSize(self.size())
 
@@ -72,7 +72,7 @@ class MqttManager(QtWidgets.QDialog, Ui_diag_mqtt):
         self.dc["mqttusername"] = self.txt_username.text()
         self.dc["mqttpassword"] = self.txt_password.text()
         self.dc["mqttclient_id"] = self.txt_client_id.text()
-        super(MqttManager, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         if self._changesdone():
@@ -95,12 +95,12 @@ class MqttManager(QtWidgets.QDialog, Ui_diag_mqtt):
                 )
             )
             return QtWidgets.QDialog.Rejected
-        return super(MqttManager, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Reject settings."""
         self._load_settings()
-        super(MqttManager, self).reject()
+        super().reject()
 
     @property
     def read_only(self):
diff --git a/src/revpicommander/revpicommander.py b/src/revpicommander/revpicommander.py
index 6b8776c..4bf0f0a 100644
--- a/src/revpicommander/revpicommander.py
+++ b/src/revpicommander/revpicommander.py
@@ -52,7 +52,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
 
     def __init__(self, parent=None):
         """Init main program."""
-        super(RevPiCommander, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.wid_debugcontrol = None  # type: DebugControl
diff --git a/src/revpicommander/revpifiles.py b/src/revpicommander/revpifiles.py
index c7afa26..038f073 100644
--- a/src/revpicommander/revpifiles.py
+++ b/src/revpicommander/revpifiles.py
@@ -26,7 +26,7 @@ class NodeType(IntEnum):
 class UploadFiles(BackgroundWorker):
 
     def __init__(self, file_list: list, parent):
-        super(UploadFiles, self).__init__(parent)
+        super().__init__(parent)
         self.ec = 1
         self.file_list = file_list
         self.plc_program_included = False  # Will be True, when opt_program was found in files
@@ -76,7 +76,7 @@ class UploadFiles(BackgroundWorker):
 class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
 
     def __init__(self, parent=None):
-        super(RevPiFiles, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.dc_settings = {}
diff --git a/src/revpicommander/revpiinfo.py b/src/revpicommander/revpiinfo.py
index d18fa40..9959bfd 100644
--- a/src/revpicommander/revpiinfo.py
+++ b/src/revpicommander/revpiinfo.py
@@ -14,7 +14,7 @@ class RevPiInfo(QtWidgets.QDialog, Ui_diag_revpiinfo):
     """Version information window."""
 
     def __init__(self, version: str, parent=None):
-        super(RevPiInfo, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self._debug_load = False
@@ -28,7 +28,7 @@ class RevPiInfo(QtWidgets.QDialog, Ui_diag_revpiinfo):
             if helper.cm.connected else "-"
         )
         self._load_lst_files()
-        return super(RevPiInfo, self).exec()
+        return super().exec()
 
     def lbl_version_mousePressEvent(self, a0: QtGui.QMouseEvent):
         if a0.button() == QtCore.Qt.MidButton:
diff --git a/src/revpicommander/revpilogfile.py b/src/revpicommander/revpilogfile.py
index c68e49f..c7f85e7 100644
--- a/src/revpicommander/revpilogfile.py
+++ b/src/revpicommander/revpilogfile.py
@@ -25,7 +25,7 @@ class DataThread(QtCore.QThread):
     """log_type, success, text"""
 
     def __init__(self, parent=None, cycle_time=1000):
-        super(DataThread, self).__init__(parent)
+        super().__init__(parent)
 
         self._cycle_time = cycle_time
         self._paused = True
@@ -113,7 +113,7 @@ class RevPiLogfile(QtWidgets.QMainWindow, Ui_win_revpilogfile):
 
     def __init__(self, parent=None):
         u"""Init RevPiLogfile-Class."""
-        super(RevPiLogfile, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.th_data = DataThread(self)
@@ -138,11 +138,11 @@ class RevPiLogfile(QtWidgets.QMainWindow, Ui_win_revpilogfile):
 
     def hideEvent(self, a0: QtGui.QHideEvent) -> None:
         self.th_data.pause()
-        super(RevPiLogfile, self).hideEvent(a0)
+        super().hideEvent(a0)
 
     def showEvent(self, a0: QtGui.QShowEvent) -> None:
         self.th_data.resume()
-        super(RevPiLogfile, self).showEvent(a0)
+        super().showEvent(a0)
 
     def _load_gui_settings(self):
         self.restoreGeometry(helper.settings.value("logfile/geo", b''))
diff --git a/src/revpicommander/revpioption.py b/src/revpicommander/revpioption.py
index 33489b0..ce878d2 100644
--- a/src/revpicommander/revpioption.py
+++ b/src/revpicommander/revpioption.py
@@ -17,7 +17,7 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
     """Set options of RevPiPyLoad."""
 
     def __init__(self, parent=None):
-        super(RevPiOption, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.setFixedSize(self.size())
 
@@ -179,7 +179,7 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
 
     def accept(self) -> None:
         if not self._changesdone():
-            super(RevPiOption, self).accept()
+            super().accept()
             return
 
         ask = QtWidgets.QMessageBox.question(
@@ -227,7 +227,7 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
         )
 
         if saved:
-            super(RevPiOption, self).accept()
+            super().accept()
         else:
             QtWidgets.QMessageBox.critical(
                 self, self.tr("Error"), self.tr(
@@ -295,12 +295,12 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
                 "color: green" if running else "color: red"
             )
 
-        return super(RevPiOption, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Reject all sub windows and reload settings."""
         self._load_settings()
-        super(RevPiOption, self).reject()
+        super().reject()
 
     @QtCore.pyqtSlot(int)
     def on_cbb_replace_io_currentIndexChanged(self, index: int):
diff --git a/src/revpicommander/revpiplclist.py b/src/revpicommander/revpiplclist.py
index 3c069cb..649296f 100644
--- a/src/revpicommander/revpiplclist.py
+++ b/src/revpicommander/revpiplclist.py
@@ -25,7 +25,7 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
     """Manage your saved connections."""
 
     def __init__(self, parent=None):
-        super(RevPiPlcList, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.__default_port = 55123
 
@@ -124,7 +124,7 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
                 revpi_settings.save_settings()
 
         self.changes = False
-        super(RevPiPlcList, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         pi.logger.debug("RevPiPlcList.closeEvent")
@@ -142,7 +142,7 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
 
     def exec(self) -> int:
         self._load_settings()
-        return super(RevPiPlcList, self).exec()
+        return super().exec()
 
     def exec_with_presets(self, presets: RevPiSettings) -> int:
         """
@@ -153,7 +153,7 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
         """
         self._load_settings()
         self.on_btn_add_clicked(presets)
-        return super(RevPiPlcList, self).exec()
+        return super().exec()
 
     @QtCore.pyqtSlot(QtWidgets.QAbstractButton)
     def on_btn_box_clicked(self, button: QtWidgets.QAbstractButton):
diff --git a/src/revpicommander/revpiprogram.py b/src/revpicommander/revpiprogram.py
index 118ebb0..7a170d4 100644
--- a/src/revpicommander/revpiprogram.py
+++ b/src/revpicommander/revpiprogram.py
@@ -23,7 +23,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
     """Program options of RevPiPyLoad."""
 
     def __init__(self, parent=None):
-        super(RevPiProgram, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.setFixedSize(self.size())
 
@@ -103,7 +103,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
     def accept(self) -> None:
         # todo: After upload ask for restart pcl program?
         if not self._changesdone():
-            super(RevPiProgram, self).accept()
+            super().accept()
             return
 
         if self.cbb_plcprogram.currentText() == "":
@@ -138,7 +138,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
         )
 
         if saved:
-            super(RevPiProgram, self).accept()
+            super().accept()
         else:
             QtWidgets.QMessageBox.critical(
                 self, self.tr("Error"), self.tr(
@@ -174,12 +174,12 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
         self._load_settings()
         self._apply_acl()
 
-        return super(RevPiProgram, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Reject all sub windows and reload settings."""
         self._load_settings()
-        super(RevPiProgram, self).reject()
+        super().reject()
 
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
     # region #      REGION: PLC program
diff --git a/src/revpicommander/simulator.py b/src/revpicommander/simulator.py
index ba6b0c9..6aa2c4b 100644
--- a/src/revpicommander/simulator.py
+++ b/src/revpicommander/simulator.py
@@ -21,7 +21,7 @@ class Simulator(QtWidgets.QDialog, Ui_diag_simulator):
     """
 
     def __init__(self, parent=None):
-        super(Simulator, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.clean_procimg = False
         self.max_items = 5
@@ -69,7 +69,7 @@ class Simulator(QtWidgets.QDialog, Ui_diag_simulator):
 
         self.clean_procimg = self.sender() is self.btn_start_empty
 
-        super(Simulator, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         self._save_gui()
diff --git a/src/revpicommander/sshauth.py b/src/revpicommander/sshauth.py
index 18f3c86..c26475e 100644
--- a/src/revpicommander/sshauth.py
+++ b/src/revpicommander/sshauth.py
@@ -31,7 +31,7 @@ class SSHAuth(QtWidgets.QDialog, Ui_diag_sshauth):
         """
         log.debug("SSHAuth.__init__")
 
-        super(SSHAuth, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self._in_keyring = False