Tests: Use new form of super()

Change-Id: Id0a6c5e67f53623cc6d41ccc377218479931ee65
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

23 files changed, 32 insertions, 32 deletions

diff --git a/sources/pyside6/tests/QtWidgets/bug_1006.py b/sources/pyside6/tests/QtWidgets/bug_1006.py
index b8d59284e..96231ddc3 100644
--- a/sources/pyside6/tests/QtWidgets/bug_1006.py
+++ b/sources/pyside6/tests/QtWidgets/bug_1006.py
@@ -43,7 +43,7 @@ from helper.timedqapplication import TimedQApplication
 
 class LabelWindow(QDialog):
     def __init__(self, parent):
-        super(LabelWindow, self).__init__(parent)
+        super().__init__(parent)
 
         self.test_layout = QGridLayout()
         label = QLabel("Label")
diff --git a/sources/pyside6/tests/QtWidgets/bug_307.py b/sources/pyside6/tests/QtWidgets/bug_307.py
index 2a149c13e..19da5148e 100644
--- a/sources/pyside6/tests/QtWidgets/bug_307.py
+++ b/sources/pyside6/tests/QtWidgets/bug_307.py
@@ -42,7 +42,7 @@ from PySide6.QtWidgets import QPushButton, QApplication
 
 class Test (QApplication) :
     def __init__(self, argv) :
-        super(Test, self).__init__(argv)
+        super().__init__(argv)
         self._called = False
 
     def called(self):
diff --git a/sources/pyside6/tests/QtWidgets/bug_338.py b/sources/pyside6/tests/QtWidgets/bug_338.py
index 111417054..329a6746c 100644
--- a/sources/pyside6/tests/QtWidgets/bug_338.py
+++ b/sources/pyside6/tests/QtWidgets/bug_338.py
@@ -42,7 +42,7 @@ from PySide6.QtWidgets import QApplication, QGraphicsPolygonItem, QGraphicsScene
 
 class DiagramItem(QGraphicsPolygonItem):
     def __init__(self, parent=None, scene=None):
-        super(DiagramItem, self).__init__(parent, scene)
+        super().__init__(parent, scene)
 
     def itemChange(self, change, value):
         return value
diff --git a/sources/pyside6/tests/QtWidgets/bug_433.py b/sources/pyside6/tests/QtWidgets/bug_433.py
index a68a0615c..0cae07435 100644
--- a/sources/pyside6/tests/QtWidgets/bug_433.py
+++ b/sources/pyside6/tests/QtWidgets/bug_433.py
@@ -41,7 +41,7 @@ from PySide6.QtWidgets import QApplication, QGraphicsScene, QGraphicsView
 
 class Test(QGraphicsView):
     def __init__(self, parent=None):
-        super(Test, self).__init__(parent)
+        super().__init__(parent)
         self.s = QGraphicsScene()
         self.setScene(self.s)
 
diff --git a/sources/pyside6/tests/QtWidgets/bug_525.py b/sources/pyside6/tests/QtWidgets/bug_525.py
index d35b41c0a..573e9bf46 100644
--- a/sources/pyside6/tests/QtWidgets/bug_525.py
+++ b/sources/pyside6/tests/QtWidgets/bug_525.py
@@ -40,7 +40,7 @@ from PySide6.QtWidgets import QMenu
 
 class M2(QMenu):
     def __init__(self,parent=None):
-        super(M2,self).__init__(parent)
+        super().__init__(parent)
         self.setTitle(self.tr("M2"))
 
 class TestMenuDerivedClass(unittest.TestCase):
diff --git a/sources/pyside6/tests/QtWidgets/bug_667.py b/sources/pyside6/tests/QtWidgets/bug_667.py
index 2fa306a9c..3cad4e11a 100644
--- a/sources/pyside6/tests/QtWidgets/bug_667.py
+++ b/sources/pyside6/tests/QtWidgets/bug_667.py
@@ -40,12 +40,12 @@ from PySide6.QtWidgets import QApplication, QGraphicsView, QGraphicsScene, QGrap
 
 class Ball(QGraphicsEllipseItem):
     def __init__(self, d, parent=None):
-        super(Ball, self).__init__(0, 0, d, d, parent)
+        super().__init__(0, 0, d, d, parent)
         self.vel = QPointF(0,0)   #commenting this out prevents the crash
 
 class Foo(QGraphicsView):
     def __init__(self):
-        super(Foo, self).__init__(None)
+        super().__init__(None)
         self.scene = QGraphicsScene(self.rect())
         self.setScene(self.scene)
         self.scene.addItem(Ball(10))
diff --git a/sources/pyside6/tests/QtWidgets/bug_668.py b/sources/pyside6/tests/QtWidgets/bug_668.py
index 8b03ebbdb..167a19ce6 100644
--- a/sources/pyside6/tests/QtWidgets/bug_668.py
+++ b/sources/pyside6/tests/QtWidgets/bug_668.py
@@ -43,7 +43,7 @@ from PySide6.QtWidgets import QApplication, QFileSystemModel, QMainWindow, QTree
 
 class A(QMainWindow):
     def __init__(self, parent=None):
-        super(A, self).__init__(parent)
+        super().__init__(parent)
         a = QFileSystemModel(self)
         a.setRootPath(QDir.homePath())
 
diff --git a/sources/pyside6/tests/QtWidgets/bug_793.py b/sources/pyside6/tests/QtWidgets/bug_793.py
index 0741617d6..08c060f15 100644
--- a/sources/pyside6/tests/QtWidgets/bug_793.py
+++ b/sources/pyside6/tests/QtWidgets/bug_793.py
@@ -40,17 +40,17 @@ from PySide6.QtWidgets import QWidget, QApplication
 
 class TestW1(QWidget):
     def __init__(self, parent = None):
-        super(TestW1, self).__init__(parent)
+        super().__init__(parent)
         TestW2(parent, self)
 
 class TestW2(QWidget):
     def __init__(self, ancestor, parent = None):
-        super(TestW2, self).__init__(parent)
+        super().__init__(parent)
         self.ancestor_ref = ancestor
 
 class Test(QWidget):
     def __init__(self):
-        super(Test, self).__init__()
+        super().__init__()
         TestW1(self)
 
 class TestQApplicationDestrcutor(unittest.TestCase):
diff --git a/sources/pyside6/tests/QtWidgets/bug_811.py b/sources/pyside6/tests/QtWidgets/bug_811.py
index 1ba027dd0..cde5f2fe9 100644
--- a/sources/pyside6/tests/QtWidgets/bug_811.py
+++ b/sources/pyside6/tests/QtWidgets/bug_811.py
@@ -43,7 +43,7 @@ from PySide6.QtWidgets import QTextEdit
 
 class TestUserData(QTextBlockUserData):
     def __init__(self, data):
-        super(TestUserData, self).__init__()
+        super().__init__()
         self.data = data
 
 class TestUserDataRefCount(UsesQApplication):
diff --git a/sources/pyside6/tests/QtWidgets/bug_836.py b/sources/pyside6/tests/QtWidgets/bug_836.py
index f985e4615..4523c525c 100644
--- a/sources/pyside6/tests/QtWidgets/bug_836.py
+++ b/sources/pyside6/tests/QtWidgets/bug_836.py
@@ -50,7 +50,7 @@ class Mixin3(object):
 
 class MainWindow(Mixin1, Mixin2, Mixin3, QFrame):
     def __init__(self):
-        super(MainWindow, self).__init__()
+        super().__init__()
 
 def main():
     app = QApplication([])
diff --git a/sources/pyside6/tests/QtWidgets/bug_844.py b/sources/pyside6/tests/QtWidgets/bug_844.py
index 1c7705939..879c08850 100644
--- a/sources/pyside6/tests/QtWidgets/bug_844.py
+++ b/sources/pyside6/tests/QtWidgets/bug_844.py
@@ -40,7 +40,7 @@ from PySide6.QtCore import QObject, QTimer
 
 class QtKeyPressListener(QObject):
     def __init__(self, obj):
-        QObject.__init__(self)
+        super().__init__()
         obj.installEventFilter(self)
 
     def eventFilter(self, obj, event):
diff --git a/sources/pyside6/tests/QtWidgets/bug_862.py b/sources/pyside6/tests/QtWidgets/bug_862.py
index f788cb12d..643b338e7 100644
--- a/sources/pyside6/tests/QtWidgets/bug_862.py
+++ b/sources/pyside6/tests/QtWidgets/bug_862.py
@@ -64,19 +64,19 @@ import PySide6.QtCore
 
 class MyQObject(QObject):
     def __init__(self):
-        QObject.__init__(self)
+        super().__init__()
 
 class MyQWidget(QWidget):
     def __init__(self):
-        QWidget.__init__(self)
+        super().__init__()
 
 class MyQGraphicsObject(QGraphicsObject):
     def __init__(self):
-        QGraphicsObject.__init__(self)
+        super().__init__()
 
 class MyQGraphicsItem(QGraphicsItem):
     def __init__(self):
-        QGraphicsItem.__init__(self)
+        super().__init__()
 
 class TestRepr (unittest.TestCase):
 
diff --git a/sources/pyside6/tests/QtWidgets/paint_event_test.py b/sources/pyside6/tests/QtWidgets/paint_event_test.py
index 19a082f71..ed5c56eee 100644
--- a/sources/pyside6/tests/QtWidgets/paint_event_test.py
+++ b/sources/pyside6/tests/QtWidgets/paint_event_test.py
@@ -50,7 +50,7 @@ class MyWidget(QWidget):
         if app is None:
             app = QApplication([])
 
-        super(MyWidget, self).__init__()
+        super().__init__()
         self.app = app
         self.runs = 0
         self.max_runs = 5
diff --git a/sources/pyside6/tests/QtWidgets/private_mangle_test.py b/sources/pyside6/tests/QtWidgets/private_mangle_test.py
index f46d11778..bfa11c350 100644
--- a/sources/pyside6/tests/QtWidgets/private_mangle_test.py
+++ b/sources/pyside6/tests/QtWidgets/private_mangle_test.py
@@ -59,7 +59,7 @@ class Harness(QWidget):
     clicked = Signal()
 
     def __init__(self):
-        QWidget.__init__(self)
+        super().__init__()
         self.clicked.connect(self.method)
         self.clicked.connect(self._method)
         self.clicked.connect(self.__method)
@@ -78,7 +78,7 @@ class _Under(QWidget):
     clicked = Signal()
 
     def __init__(self):
-        QWidget.__init__(self)
+        super().__init__()
         self.clicked.connect(self.method)
         self.clicked.connect(self._method)
         self.clicked.connect(self.__method)
diff --git a/sources/pyside6/tests/QtWidgets/qgraphicsscene_test.py b/sources/pyside6/tests/QtWidgets/qgraphicsscene_test.py
index a87ddd142..54e81c45c 100644
--- a/sources/pyside6/tests/QtWidgets/qgraphicsscene_test.py
+++ b/sources/pyside6/tests/QtWidgets/qgraphicsscene_test.py
@@ -63,7 +63,7 @@ class Constructor(unittest.TestCase):
 # QWidget due to handling multiple inheritance incorrectly.
 class CustomScene(QGraphicsScene):
     def __init__(self, parent = None):
-        super(CustomScene, self).__init__(parent)
+        super().__init__(parent)
         self.dpi = 0
 
     def drawBackground(self, painter, rect):
diff --git a/sources/pyside6/tests/QtWidgets/qpen_test.py b/sources/pyside6/tests/QtWidgets/qpen_test.py
index fc365ff07..c833ebd92 100644
--- a/sources/pyside6/tests/QtWidgets/qpen_test.py
+++ b/sources/pyside6/tests/QtWidgets/qpen_test.py
@@ -43,7 +43,7 @@ from PySide6.QtWidgets import QWidget
 
 class Painting(QWidget):
     def __init__(self):
-        QWidget.__init__(self)
+        super().__init__()
         self.penFromEnum = None
         self.penFromInteger = None
 
diff --git a/sources/pyside6/tests/QtWidgets/qpushbutton_test.py b/sources/pyside6/tests/QtWidgets/qpushbutton_test.py
index bcec339c8..f126f58b6 100644
--- a/sources/pyside6/tests/QtWidgets/qpushbutton_test.py
+++ b/sources/pyside6/tests/QtWidgets/qpushbutton_test.py
@@ -41,7 +41,7 @@ from PySide6.QtCore import QTimer
 
 class MyWidget(QWidget):
     def __init__(self):
-        QWidget.__init__(self)
+        super().__init__()
 
         m = QMenu(self)
         b = QPushButton("Hello", self)
diff --git a/sources/pyside6/tests/QtWidgets/qshortcut_test.py b/sources/pyside6/tests/QtWidgets/qshortcut_test.py
index e09af1ac0..4fefcca64 100644
--- a/sources/pyside6/tests/QtWidgets/qshortcut_test.py
+++ b/sources/pyside6/tests/QtWidgets/qshortcut_test.py
@@ -45,7 +45,7 @@ from PySide6.QtWidgets import QApplication, QWidget
 
 class Foo(QWidget):
     def __init__(self):
-        QWidget.__init__(self)
+        super().__init__()
         self.ok = False
         self.copy = False
 
diff --git a/sources/pyside6/tests/QtWidgets/qtabwidgetclear_test.py b/sources/pyside6/tests/QtWidgets/qtabwidgetclear_test.py
index b4250c2c1..ff87f2bc2 100644
--- a/sources/pyside6/tests/QtWidgets/qtabwidgetclear_test.py
+++ b/sources/pyside6/tests/QtWidgets/qtabwidgetclear_test.py
@@ -40,7 +40,7 @@ from helper.usesqapplication import UsesQApplication
 
 class TabWidgetClear(QMainWindow):
     def __init__(self):
-        QMainWindow.__init__(self)
+        super().__init__()
         self.tabWidget = QTabWidget(self)
         self.setCentralWidget(self.tabWidget)
         self.editBox = QTextEdit(self)
diff --git a/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py b/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py
index 4820d953b..964e187f9 100644
--- a/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py
+++ b/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py
@@ -48,7 +48,7 @@ class MyWindow(QMainWindow):
         self.appendText.emit("PySide")
 
     def __init__(self, parent=None):
-        super(MyWindow, self).__init__(parent)
+        super().__init__(parent)
 
         self.textEdit = QTextEdit()
         self.btn = QPushButton("ClickMe")
diff --git a/sources/pyside6/tests/QtWidgets/qwidget_test.py b/sources/pyside6/tests/QtWidgets/qwidget_test.py
index 6ff904201..5b8bdd5a0 100644
--- a/sources/pyside6/tests/QtWidgets/qwidget_test.py
+++ b/sources/pyside6/tests/QtWidgets/qwidget_test.py
@@ -41,14 +41,14 @@ from helper.usesqapplication import UsesQApplication
 
 class QWidgetInherit(QMainWindow):
     def __init__(self):
-        QWidget.__init__(self)
+        QWidget.__init__(self)  # Intended: Initialize QWidget instead of base
 
 class NativeEventTestWidget(QWidget):
 
     nativeEventCount = 0
 
     def __init__(self):
-        QWidget.__init__(self)
+        super().__init__()
 
     def nativeEvent(self, eventType, message):
         self.nativeEventCount = self.nativeEventCount + 1
@@ -67,7 +67,7 @@ class QWidgetVisible(UsesQApplication):
         self.assertTrue(not widget.isVisible())
         widget.setVisible(True)
         self.assertTrue(widget.isVisible())
-        self.assertTrue(widget.winId() is not 0)
+        self.assertTrue(widget.winId() != 0)
         # skip this test on macOS since no native events are received
         if sys.platform == 'darwin':
             return
diff --git a/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py b/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py
index 220a6e31a..5fd685f01 100644
--- a/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py
+++ b/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py
@@ -47,7 +47,7 @@ class MySpinButton(QSpinBox):
 
     def __init__(self, max_runs=5, app=None):
         #Creates a new spinbox that will run <max_runs> and quit <app>
-        super(MySpinButton, self).__init__()
+        super().__init__()
 
         if app is None:
             app = QApplication([])
diff --git a/sources/pyside6/tests/QtWidgets/wrong_return_test.py b/sources/pyside6/tests/QtWidgets/wrong_return_test.py
index 019010f50..134acef14 100644
--- a/sources/pyside6/tests/QtWidgets/wrong_return_test.py
+++ b/sources/pyside6/tests/QtWidgets/wrong_return_test.py
@@ -47,7 +47,7 @@ warnings.simplefilter('error')
 
 class MyWidget(QWidget):
     def __init__(self, parent=None):
-        super(MyWidget, self).__init__(parent)
+        super().__init__(parent)
 
     def sizeHint(self):
         pass