Tests: Use per-class imports

Change-Id: I6dac1f54152fecab7af6831bc3c813a016408aae
Reviewed-by: Christian Tismer <tismer@stackless.com>

23 files changed, 155 insertions, 133 deletions

diff --git a/sources/pyside6/tests/QtWidgets/bug_1048.py b/sources/pyside6/tests/QtWidgets/bug_1048.py
index 18fc62782..0c5cdb0b5 100644
--- a/sources/pyside6/tests/QtWidgets/bug_1048.py
+++ b/sources/pyside6/tests/QtWidgets/bug_1048.py
@@ -35,11 +35,12 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1] / "util"))
 from init_paths import init_test_paths
 init_test_paths()
 
-from PySide6 import QtWidgets
+from PySide6.QtWidgets import QApplication, QGridLayout, QWidget
 
-a = QtWidgets.QApplication([])
 
-w = QtWidgets.QWidget()
-l = QtWidgets.QGridLayout(w)
+a = QApplication([])
+
+w = QWidget()
+l = QGridLayout(w)
 
 l.itemAtPosition(0, 0)
diff --git a/sources/pyside6/tests/QtWidgets/bug_1077.py b/sources/pyside6/tests/QtWidgets/bug_1077.py
index b736a558a..4c35e16bb 100644
--- a/sources/pyside6/tests/QtWidgets/bug_1077.py
+++ b/sources/pyside6/tests/QtWidgets/bug_1077.py
@@ -38,17 +38,18 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1] / "util"))
 from init_paths import init_test_paths
 init_test_paths()
 
-from PySide6 import QtCore, QtGui, QtWidgets
+from PySide6.QtGui import QSyntaxHighlighter
+from PySide6.QtWidgets import QApplication, QTextEdit, QWidget
 
 
-class Highlighter(QtGui.QSyntaxHighlighter):
+class Highlighter(QSyntaxHighlighter):
     def __init__(self, parent, mode):
-        QtGui.QSyntaxHighlighter.__init__(self, parent)
+        super().__init__(parent)
         self.tstamp = time.time()
 
 if __name__ == "__main__":
-    app = QtWidgets.QApplication([])
-    python = QtWidgets.QTextEdit()
+    app = QApplication([])
+    python = QTextEdit()
     python.setWindowTitle("python")
     hl = Highlighter(python.document(), "python")
     python.show()
diff --git a/sources/pyside6/tests/QtWidgets/bug_338.py b/sources/pyside6/tests/QtWidgets/bug_338.py
index cd3602b08..111417054 100644
--- a/sources/pyside6/tests/QtWidgets/bug_338.py
+++ b/sources/pyside6/tests/QtWidgets/bug_338.py
@@ -37,9 +37,10 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtWidgets import QApplication, QGraphicsPolygonItem, QGraphicsScene
 
-class DiagramItem(QtWidgets.QGraphicsPolygonItem):
+
+class DiagramItem(QGraphicsPolygonItem):
     def __init__(self, parent=None, scene=None):
         super(DiagramItem, self).__init__(parent, scene)
 
@@ -49,8 +50,8 @@ class DiagramItem(QtWidgets.QGraphicsPolygonItem):
 
 class BugTest(unittest.TestCase):
     def test(self):
-        app = QtWidgets.QApplication(sys.argv)
-        scene = QtWidgets.QGraphicsScene()
+        app = QApplication(sys.argv)
+        scene = QGraphicsScene()
         item = DiagramItem()
         item2 = DiagramItem()
         #this cause segfault
diff --git a/sources/pyside6/tests/QtWidgets/bug_389.py b/sources/pyside6/tests/QtWidgets/bug_389.py
index fc8460a6b..3b0ca6a54 100644
--- a/sources/pyside6/tests/QtWidgets/bug_389.py
+++ b/sources/pyside6/tests/QtWidgets/bug_389.py
@@ -38,13 +38,15 @@ from init_paths import init_test_paths
 init_test_paths(False)
 
 from helper.usesqapplication import UsesQApplication
-from PySide6 import QtCore, QtGui, QtWidgets
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import QStyle, QWidget
+
 
 class BugTest(UsesQApplication):
     def testCase(self):
-        s = QtWidgets.QWidget().style()
-        i = s.standardIcon(QtWidgets.QStyle.SP_TitleBarMinButton)
-        self.assertEqual(type(i), QtGui.QIcon)
+        s = QWidget().style()
+        i = s.standardIcon(QStyle.SP_TitleBarMinButton)
+        self.assertEqual(type(i), QIcon)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside6/tests/QtWidgets/bug_433.py b/sources/pyside6/tests/QtWidgets/bug_433.py
index 1c8313d2a..a68a0615c 100644
--- a/sources/pyside6/tests/QtWidgets/bug_433.py
+++ b/sources/pyside6/tests/QtWidgets/bug_433.py
@@ -35,16 +35,18 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1] / "util"))
 from init_paths import init_test_paths
 init_test_paths()
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtCore import QTimer
+from PySide6.QtWidgets import QApplication, QGraphicsScene, QGraphicsView
 
-class Test(QtWidgets.QGraphicsView):
+
+class Test(QGraphicsView):
     def __init__(self, parent=None):
         super(Test, self).__init__(parent)
-        self.s = QtWidgets.QGraphicsScene()
+        self.s = QGraphicsScene()
         self.setScene(self.s)
 
-a = QtWidgets.QApplication(sys.argv)
+a = QApplication(sys.argv)
 t = Test()
 t.show()
-QtCore.QTimer.singleShot(0, t.close)
+QTimer.singleShot(0, t.close)
 sys.exit(a.exec_())
diff --git a/sources/pyside6/tests/QtWidgets/bug_547.py b/sources/pyside6/tests/QtWidgets/bug_547.py
index a431f2dad..0753e932e 100644
--- a/sources/pyside6/tests/QtWidgets/bug_547.py
+++ b/sources/pyside6/tests/QtWidgets/bug_547.py
@@ -39,12 +39,13 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtWidgets
+from PySide6.QtWidgets import QApplication, QTreeWidget, QTreeWidgetItem
+
 
 class MyMainWindow(unittest.TestCase):
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     def testCase1(self):
-        self._tree = QtWidgets.QTreeWidget()
+        self._tree = QTreeWidget()
         self._tree.setColumnCount(2)
         self._i1 = None
         self._i11 = None
@@ -61,7 +62,7 @@ class MyMainWindow(unittest.TestCase):
         self.assertEqual(sys.getrefcount(self._i11), 3)
 
     def testCase2(self):
-        self._tree = QtWidgets.QTreeWidget()
+        self._tree = QTreeWidget()
         self._tree.setColumnCount(2)
         self._i1 = None
         self._i11 = None
@@ -82,9 +83,9 @@ class MyMainWindow(unittest.TestCase):
             self.assertEqual(sys.getrefcount(self._i1), 2)
             self.assertEqual(sys.getrefcount(self._i11), 2)
 
-        self._i1 = QtWidgets.QTreeWidgetItem(self._tree, ['1', ])
+        self._i1 = QTreeWidgetItem(self._tree, ['1', ])
         self.assertEqual(sys.getrefcount(self._i1), 3)
-        self._i11 = QtWidgets.QTreeWidgetItem(self._i1, ['11', ])
+        self._i11 = QTreeWidgetItem(self._i1, ['11', ])
         self.assertEqual(sys.getrefcount(self._i11), 3)
 
 if __name__ == '__main__':
diff --git a/sources/pyside6/tests/QtWidgets/bug_576.py b/sources/pyside6/tests/QtWidgets/bug_576.py
index 784741b5e..b148f7c89 100644
--- a/sources/pyside6/tests/QtWidgets/bug_576.py
+++ b/sources/pyside6/tests/QtWidgets/bug_576.py
@@ -39,20 +39,22 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtCore import QObject
+from PySide6.QtWidgets import QApplication, QPushButton, QWidget
+
 
 class Bug576(unittest.TestCase):
     def onButtonDestroyed(self, button):
         self._destroyed = True
-        self.assertTrue(isinstance(button, QtWidgets.QPushButton))
+        self.assertTrue(isinstance(button, QPushButton))
 
     def testWidgetParent(self):
         self._destroyed = False
-        app = QtWidgets.QApplication(sys.argv)
-        w = QtWidgets.QWidget()
+        app = QApplication(sys.argv)
+        w = QWidget()
 
-        b = QtWidgets.QPushButton("test")
-        b.destroyed[QtCore.QObject].connect(self.onButtonDestroyed)
+        b = QPushButton("test")
+        b.destroyed[QObject].connect(self.onButtonDestroyed)
         self.assertEqual(sys.getrefcount(b), 2)
         b.setParent(w)
         self.assertEqual(sys.getrefcount(b), 3)
diff --git a/sources/pyside6/tests/QtWidgets/bug_585.py b/sources/pyside6/tests/QtWidgets/bug_585.py
index 01e593349..eeb89c297 100644
--- a/sources/pyside6/tests/QtWidgets/bug_585.py
+++ b/sources/pyside6/tests/QtWidgets/bug_585.py
@@ -37,15 +37,16 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtWidgets import QApplication, QTreeWidget, QTreeWidgetItem
+
 
 class Bug585(unittest.TestCase):
     def testCase(self):
-        app = QtWidgets.QApplication([])
-        self._tree = QtWidgets.QTreeWidget()
+        app = QApplication([])
+        self._tree = QTreeWidget()
         self._tree.setColumnCount(2)
-        i1 = QtWidgets.QTreeWidgetItem(self._tree, ['1', ])
-        i2 = QtWidgets.QTreeWidgetItem(self._tree, ['2', ])
+        i1 = QTreeWidgetItem(self._tree, ['1', ])
+        i2 = QTreeWidgetItem(self._tree, ['2', ])
         refCount = sys.getrefcount(i1)
 
         # this function return None
diff --git a/sources/pyside6/tests/QtWidgets/bug_589.py b/sources/pyside6/tests/QtWidgets/bug_589.py
index 249894c33..48faae17e 100644
--- a/sources/pyside6/tests/QtWidgets/bug_589.py
+++ b/sources/pyside6/tests/QtWidgets/bug_589.py
@@ -37,19 +37,19 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtWidgets import QApplication, QGraphicsProxyWidget
 
 
-class CustomWidget(QtWidgets.QGraphicsProxyWidget):
+class CustomWidget(QGraphicsProxyWidget):
    def itemChange(self, eventType, value):
-      QtWidgets.QGraphicsProxyWidget.itemChange(self, eventType, value)
+      QGraphicsProxyWidget.itemChange(self, eventType, value)
 
 class Bug589(unittest.TestCase):
    def testCase(self):
-      widget = QtWidgets.QGraphicsProxyWidget()
+      widget = QGraphicsProxyWidget()
       custom = CustomWidget()
       custom.setParentItem(widget)
 
 if __name__ == "__main__":
-   app = QtWidgets.QApplication(sys.argv)
+   app = QApplication(sys.argv)
    unittest.main()
diff --git a/sources/pyside6/tests/QtWidgets/bug_834.py b/sources/pyside6/tests/QtWidgets/bug_834.py
index 232d71c19..3a3926359 100644
--- a/sources/pyside6/tests/QtWidgets/bug_834.py
+++ b/sources/pyside6/tests/QtWidgets/bug_834.py
@@ -35,21 +35,23 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1] / "util"))
 from init_paths import init_test_paths
 init_test_paths()
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtCore import QTimer, Qt
+from PySide6.QtWidgets import QApplication, QDockWidget, QMainWindow
 
-class Window(QtWidgets.QMainWindow):
+
+class Window(QMainWindow):
     def childEvent(self, event):
         super(Window, self).childEvent(event)
 
-app = QtWidgets.QApplication([])
+app = QApplication([])
 window = Window()
 
-dock1 = QtWidgets.QDockWidget()
-dock2 = QtWidgets.QDockWidget()
-window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, dock1)
-window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, dock2)
+dock1 = QDockWidget()
+dock2 = QDockWidget()
+window.addDockWidget(Qt.LeftDockWidgetArea, dock1)
+window.addDockWidget(Qt.LeftDockWidgetArea, dock2)
 window.tabifyDockWidget(dock1, dock2)
 
 window.show()
-QtCore.QTimer.singleShot(0, window.close)
+QTimer.singleShot(0, window.close)
 app.exec_()
diff --git a/sources/pyside6/tests/QtWidgets/bug_921.py b/sources/pyside6/tests/QtWidgets/bug_921.py
index a7b0e99d4..9c7924efb 100644
--- a/sources/pyside6/tests/QtWidgets/bug_921.py
+++ b/sources/pyside6/tests/QtWidgets/bug_921.py
@@ -37,20 +37,21 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
-
+from PySide6.QtCore import QObject, Signal, Qt
+from PySide6.QtWidgets import QMainWindow
 from helper.timedqapplication import TimedQApplication
 
-class Signaller(QtCore.QObject):
-    s1 = QtCore.Signal()
-    s2 = QtCore.Signal()
-    s3 = QtCore.Signal()
+
+class Signaller(QObject):
+    s1 = Signal()
+    s2 = Signal()
+    s3 = Signal()
 
 class Window(object):
 
     def __init__(self, s):
-        self._window = QtWidgets.QMainWindow()
-        self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
+        self._window = QMainWindow()
+        self._window.setAttribute(Qt.WA_DeleteOnClose, True)
         self._window.setWindowTitle("Demo!")
 
         self._s = s
diff --git a/sources/pyside6/tests/QtWidgets/python_properties_test.py b/sources/pyside6/tests/QtWidgets/python_properties_test.py
index c12052315..4c90dce28 100644
--- a/sources/pyside6/tests/QtWidgets/python_properties_test.py
+++ b/sources/pyside6/tests/QtWidgets/python_properties_test.py
@@ -35,16 +35,18 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtCore import QLocale
+from PySide6.QtWidgets import QGraphicsItem, QStyleOptionViewItem
+
 
 class Properties(unittest.TestCase):
 
     def testStaticProperty(self):
-        self.assertEqual(QtWidgets.QGraphicsItem.UserType, 65536)
+        self.assertEqual(QGraphicsItem.UserType, 65536)
 
     def testInstanceProperty(self):
-        p = QtWidgets.QStyleOptionViewItem()
-        self.assertTrue(isinstance(p.locale, QtCore.QLocale))
+        p = QStyleOptionViewItem()
+        self.assertTrue(isinstance(p.locale, QLocale))
 
         # PSYIDE-304, can assign to a "const QWidget *" field
         p.widget = None
diff --git a/sources/pyside6/tests/QtWidgets/qapp_issue_585.py b/sources/pyside6/tests/QtWidgets/qapp_issue_585.py
index 1b859db53..9e3674374 100644
--- a/sources/pyside6/tests/QtWidgets/qapp_issue_585.py
+++ b/sources/pyside6/tests/QtWidgets/qapp_issue_585.py
@@ -68,9 +68,10 @@ from init_paths import init_test_paths
 init_test_paths()
 
 from PySide6.QtCore import QTimer
-from PySide6 import QtWidgets
+from PySide6.QtWidgets import QApplication
 
-app_instance = QtWidgets.QApplication([])
+
+app_instance = QApplication([])
 # If the following line is commented, application doesn't crash on exit anymore.
 app_instance2 = app_instance
 QTimer.singleShot(0, qApp.quit)
diff --git a/sources/pyside6/tests/QtWidgets/qfontdialog_test.py b/sources/pyside6/tests/QtWidgets/qfontdialog_test.py
index e0f834932..59c5dca3b 100644
--- a/sources/pyside6/tests/QtWidgets/qfontdialog_test.py
+++ b/sources/pyside6/tests/QtWidgets/qfontdialog_test.py
@@ -35,22 +35,21 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore
-from PySide6 import QtGui
-from PySide6 import QtWidgets
-
+from PySide6.QtGui import QFont
+from PySide6.QtWidgets import QFontDialog
 from helper.timedqapplication import TimedQApplication
 
+
 class TestFontDialog(TimedQApplication):
 
     def testGetFont(self):
-        QtWidgets.QFontDialog.getFont()
+        QFontDialog.getFont()
 
     def testGetFontQDialog(self):
-        QtWidgets.QFontDialog.getFont(QtGui.QFont("FreeSans",10))
+        QFontDialog.getFont(QFont("FreeSans",10))
 
     def testGetFontQDialogQString(self):
-        QtWidgets.QFontDialog.getFont(QtGui.QFont("FreeSans",10), None, "Select font")
+        QFontDialog.getFont(QFont("FreeSans",10), None, "Select font")
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside6/tests/QtWidgets/qgraphicsitem_isblocked_test.py b/sources/pyside6/tests/QtWidgets/qgraphicsitem_isblocked_test.py
index c03dde0c0..ed9485d0d 100644
--- a/sources/pyside6/tests/QtWidgets/qgraphicsitem_isblocked_test.py
+++ b/sources/pyside6/tests/QtWidgets/qgraphicsitem_isblocked_test.py
@@ -37,21 +37,22 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore
-from PySide6 import QtGui
-from PySide6 import QtWidgets
+from PySide6.QtCore import QRectF
+from PySide6.QtWidgets import QGraphicsItem
+from PySide6.QtGui import QColor
 from helper.usesqapplication import UsesQApplication
 
-class Item(QtWidgets.QGraphicsItem):
+
+class Item(QGraphicsItem):
 
     def __init__(self):
-        QtWidgets.QGraphicsItem.__init__(self)
+        super().__init__()
 
     def boundingRect(self):
-        return QtCore.QRectF(0, 0, 100, 100)
+        return QRectF(0, 0, 100, 100)
 
     def paint(self, painter, option, widget):
-        painter.setBrush(QtGui.QColor(255, 255, 255))
+        painter.setBrush(QColor(255, 255, 255))
         painter.drawRect(0, 0, 100, 100)
 
 
diff --git a/sources/pyside6/tests/QtWidgets/qinputdialog_get_test.py b/sources/pyside6/tests/QtWidgets/qinputdialog_get_test.py
index f71434126..df3307d77 100644
--- a/sources/pyside6/tests/QtWidgets/qinputdialog_get_test.py
+++ b/sources/pyside6/tests/QtWidgets/qinputdialog_get_test.py
@@ -35,23 +35,24 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtWidgets import QInputDialog
 from helper.timedqapplication import TimedQApplication
 
+
 class TestInputDialog(TimedQApplication):
 
     def testGetDouble(self):
-        self.assertEqual(QtWidgets.QInputDialog.getDouble(None, "title", "label"), (0.0, False))
+        self.assertEqual(QInputDialog.getDouble(None, "title", "label"), (0.0, False))
 
     def testGetInt(self):
-        self.assertEqual(QtWidgets.QInputDialog.getInt(None, "title", "label"), (0, False))
+        self.assertEqual(QInputDialog.getInt(None, "title", "label"), (0, False))
 
     def testGetItem(self):
-        (item, bool) = QtWidgets.QInputDialog.getItem(None, "title", "label", ["1", "2", "3"])
+        (item, bool) = QInputDialog.getItem(None, "title", "label", ["1", "2", "3"])
         self.assertEqual(str(item), "1")
 
     def testGetText(self):
-        (text, bool) = QtWidgets.QInputDialog.getText(None, "title", "label")
+        (text, bool) = QInputDialog.getText(None, "title", "label")
         self.assertEqual(str(text),"")
 
 if __name__ == '__main__':
diff --git a/sources/pyside6/tests/QtWidgets/qlistwidget_test.py b/sources/pyside6/tests/QtWidgets/qlistwidget_test.py
index f0f0790a3..5ca2507e9 100644
--- a/sources/pyside6/tests/QtWidgets/qlistwidget_test.py
+++ b/sources/pyside6/tests/QtWidgets/qlistwidget_test.py
@@ -35,17 +35,19 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtWidgets, QtCore
+from PySide6.QtCore import QObject, QTimer, Qt
+from PySide6.QtWidgets import QListWidget, QListWidgetItem
 from helper.usesqapplication import UsesQApplication
 
+
 class QListWidgetTest(UsesQApplication):
 
     def populateList(self, lst):
-        o = QtCore.QObject()
+        o = QObject()
         o.setObjectName("obj")
 
-        item = QtWidgets.QListWidgetItem("item0")
-        item.setData(QtCore.Qt.UserRole, o)
+        item = QListWidgetItem("item0")
+        item.setData(Qt.UserRole, o)
         #item._data = o
         self.assertTrue(sys.getrefcount(o), 3)
         self.assertTrue(sys.getrefcount(item), 2)
@@ -58,13 +60,13 @@ class QListWidgetTest(UsesQApplication):
 
     def checkItemData(self, lst):
         item = lst.currentItem()
-        o = item.data(QtCore.Qt.UserRole)
+        o = item.data(Qt.UserRole)
         self.assertTrue(sys.getrefcount(o), 4)
         self.assertEqual(o, item._data)
         self.assertTrue(sys.getrefcount(o), 2)
 
     def testConstructorWithParent(self):
-        lst = QtWidgets.QListWidget()
+        lst = QListWidget()
         self.populateList(lst)
         self.checkCurrentItem(lst)
         i = lst.item(0)
@@ -75,17 +77,17 @@ class QListWidgetTest(UsesQApplication):
         del i
 
     def testIt(self):
-        lst = QtWidgets.QListWidget()
+        lst = QListWidget()
         lst.show()
         slot = lambda : lst.removeItemWidget(lst.currentItem())
-        lst.addItem(QtWidgets.QListWidgetItem("foo"))
-        QtCore.QTimer.singleShot(0, slot)
-        QtCore.QTimer.singleShot(0, lst.close)
+        lst.addItem(QListWidgetItem("foo"))
+        QTimer.singleShot(0, slot)
+        QTimer.singleShot(0, lst.close)
         self.app.exec_()
         self.assertEqual(lst.count(), 1)
 
     def testClear(self):
-        lst = QtWidgets.QListWidget()
+        lst = QListWidget()
         lst.addItem("foo")
         item = lst.item(0)
         self.assertIsNone(lst.clear())
diff --git a/sources/pyside6/tests/QtWidgets/qlistwidgetitem_test.py b/sources/pyside6/tests/QtWidgets/qlistwidgetitem_test.py
index 99744c8ea..7cfbfe3d1 100644
--- a/sources/pyside6/tests/QtWidgets/qlistwidgetitem_test.py
+++ b/sources/pyside6/tests/QtWidgets/qlistwidgetitem_test.py
@@ -35,15 +35,15 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtWidgets
-
+from PySide6.QtWidgets import QListWidget, QListWidgetItem
 from helper.usesqapplication import UsesQApplication
 
+
 class QListWidgetItemConstructor(UsesQApplication):
 
     def setUp(self):
         super(QListWidgetItemConstructor, self).setUp()
-        self.widgetList = QtWidgets.QListWidget()
+        self.widgetList = QListWidget()
 
     def tearDown(self):
         del self.widgetList
@@ -51,13 +51,13 @@ class QListWidgetItemConstructor(UsesQApplication):
 
     def testConstructorWithParent(self):
         # Bug 235 - QListWidgetItem constructor not saving ownership
-        QtWidgets.QListWidgetItem(self.widgetList)
+        QListWidgetItem(self.widgetList)
         item = self.widgetList.item(0)
         self.assertEqual(item.listWidget(), self.widgetList)
 
     def testConstructorWithNone(self):
         # Bug 452 - QListWidgetItem() not casting NoneType to null correctly.
-        item = QtWidgets.QListWidgetItem(None, 123)
+        item = QListWidgetItem(None, 123)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside6/tests/QtWidgets/qmainwindow_test.py b/sources/pyside6/tests/QtWidgets/qmainwindow_test.py
index fd60754fb..4ed726eb4 100644
--- a/sources/pyside6/tests/QtWidgets/qmainwindow_test.py
+++ b/sources/pyside6/tests/QtWidgets/qmainwindow_test.py
@@ -36,25 +36,25 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtWidgets
-from PySide6 import QtCore
-
+from PySide6.QtCore import QTimer
+from PySide6.QtWidgets import QMainWindow, QPushButton, QToolButton, QWidget
 from helper.usesqapplication import UsesQApplication
 
-class MainWindow(QtWidgets.QMainWindow):
+
+class MainWindow(QMainWindow):
     def __init__(self):
-        QtWidgets.QMainWindow.__init__(self)
+        super().__init__()
 
         self.createToolbar()
 
     def createToolbar(self):
-        pointerButton = QtWidgets.QToolButton()
+        pointerButton = QToolButton()
         pointerToolbar = self.addToolBar("Pointer type")
         pointerToolbar.addWidget(pointerButton)
 
-class MyButton(QtWidgets.QPushButton):
+class MyButton(QPushButton):
     def __init__(self, parent=None):
-        QtWidgets.QPushButton.__init__(self)
+        super().__init__()
         self._called = False
 
     def myCallback(self):
@@ -66,15 +66,15 @@ class TestMainWindow(UsesQApplication):
     def testCreateToolbar(self):
         w = MainWindow()
         w.show()
-        QtCore.QTimer.singleShot(1000, self.app.quit)
+        QTimer.singleShot(1000, self.app.quit)
         self.app.exec_()
 
     def objDel(self, obj):
         self.app.quit()
 
     def testRefCountToNull(self):
-        w = QtWidgets.QMainWindow()
-        c = QtWidgets.QWidget()
+        w = QMainWindow()
+        c = QWidget()
         self.assertEqual(sys.getrefcount(c), 2)
         w.setCentralWidget(c)
         self.assertEqual(sys.getrefcount(c), 3)
@@ -84,13 +84,13 @@ class TestMainWindow(UsesQApplication):
         self.app.exec_()
 
     def testRefCountToAnother(self):
-        w = QtWidgets.QMainWindow()
-        c = QtWidgets.QWidget()
+        w = QMainWindow()
+        c = QWidget()
         self.assertEqual(sys.getrefcount(c), 2)
         w.setCentralWidget(c)
         self.assertEqual(sys.getrefcount(c), 3)
 
-        c2 = QtWidgets.QWidget()
+        c2 = QWidget()
         w.setCentralWidget(c2)
         self.assertEqual(sys.getrefcount(c2), 3)
 
@@ -101,7 +101,7 @@ class TestMainWindow(UsesQApplication):
         self.app.exec_()
 
     def testSignalDisconect(self):
-        w = QtWidgets.QMainWindow()
+        w = QMainWindow()
         b = MyButton("button")
         b.clicked.connect(b.myCallback)
         w.setCentralWidget(b)
diff --git a/sources/pyside6/tests/QtWidgets/qmenuadd_test.py b/sources/pyside6/tests/QtWidgets/qmenuadd_test.py
index 6b9dad488..cbe738e53 100644
--- a/sources/pyside6/tests/QtWidgets/qmenuadd_test.py
+++ b/sources/pyside6/tests/QtWidgets/qmenuadd_test.py
@@ -39,17 +39,17 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtWidgets
-
+from PySide6.QtWidgets import QMenu
 from helper.usesqapplication import UsesQApplication
 
+
 class QMenuAddAction(UsesQApplication):
 
     def openFile(self, *args):
         self.arg = args
 
     def testQMenuAddAction(self):
-        fileMenu = QtWidgets.QMenu("&File")
+        fileMenu = QMenu("&File")
 
         addNewAction = fileMenu.addAction("&Open...", self.openFile)
         addNewAction.trigger()
diff --git a/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py b/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py
index 9c7e51a40..4820d953b 100644
--- a/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py
+++ b/sources/pyside6/tests/QtWidgets/qtextedit_signal_test.py
@@ -35,22 +35,23 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtCore import Signal, Slot
+from PySide6.QtWidgets import QMainWindow, QPushButton, QTextEdit
 from helper.usesqapplication import UsesQApplication
 
 
-class MyWindow(QtWidgets.QMainWindow):
-    appendText = QtCore.Signal(str)
+class MyWindow(QMainWindow):
+    appendText = Signal(str)
 
-    @QtCore.Slot()
+    @Slot()
     def onButtonPressed(self):
         self.appendText.emit("PySide")
 
     def __init__(self, parent=None):
         super(MyWindow, self).__init__(parent)
 
-        self.textEdit = QtWidgets.QTextEdit()
-        self.btn = QtWidgets.QPushButton("ClickMe")
+        self.textEdit = QTextEdit()
+        self.btn = QPushButton("ClickMe")
         self.btn.clicked.connect(self.onButtonPressed)
         self.appendText.connect(self.textEdit.append)
 
diff --git a/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py b/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py
index 28dfb07b5..ebd49012e 100644
--- a/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py
+++ b/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py
@@ -49,15 +49,16 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtCore, QtWidgets
+from PySide6.QtCore import QTimer
+from PySide6.QtWidgets import QApplication, QTreeWidget, QTreeWidgetItem
 
 
 class QTreeWidgetItemTest(unittest.TestCase):
     def testClass(self):
-        app = QtWidgets.QApplication([])
-        treewidget = QtWidgets.QTreeWidget()
-        item = QtWidgets.QTreeWidgetItem(["Words and stuff"])
-        item2 = QtWidgets.QTreeWidgetItem(["More words!"])
+        app = QApplication([])
+        treewidget = QTreeWidget()
+        item = QTreeWidgetItem(["Words and stuff"])
+        item2 = QTreeWidgetItem(["More words!"])
         treewidget.insertTopLevelItem(0, item)
 
         dummy_list = ["Numbers", "Symbols", "Spam"]
@@ -66,7 +67,7 @@ class QTreeWidgetItemTest(unittest.TestCase):
         self.assertFalse(item == item2)
         self.assertTrue(item != item2)
         treewidget.show()
-        QtCore.QTimer.singleShot(500, app.quit)
+        QTimer.singleShot(500, app.quit)
         app.exec_()
 
 
diff --git a/sources/pyside6/tests/QtWidgets/wrong_return_test.py b/sources/pyside6/tests/QtWidgets/wrong_return_test.py
index df0368599..019010f50 100644
--- a/sources/pyside6/tests/QtWidgets/wrong_return_test.py
+++ b/sources/pyside6/tests/QtWidgets/wrong_return_test.py
@@ -38,14 +38,14 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6 import QtWidgets
+from PySide6.QtWidgets import QWidget
 from helper.usesqapplication import UsesQApplication
 
 
 warnings.simplefilter('error')
 
 
-class MyWidget(QtWidgets.QWidget):
+class MyWidget(QWidget):
     def __init__(self, parent=None):
         super(MyWidget, self).__init__(parent)