From 661f21d976842c23c4a97cc63576680669945970 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Fri, 30 Apr 2021 17:48:19 +0200 Subject: tests: use exec() instead of exec_() Change-Id: I0868f70d7dfeafa7762296da5aa6efc2f32fcb5e Reviewed-by: Qt CI Bot Reviewed-by: Christian Tismer (cherry picked from commit 64d5282e6e3d346ee10242812b2a17a6ef2c2c9f) Reviewed-by: Cristian Maureira-Fredes --- sources/pyside6/tests/Qt3DExtras/qt3dextras_test.py | 2 +- sources/pyside6/tests/QtCharts/qcharts_test.py | 2 +- sources/pyside6/tests/QtCore/bug_1019.py | 2 +- sources/pyside6/tests/QtCore/bug_462.py | 2 +- sources/pyside6/tests/QtCore/bug_953.py | 2 +- sources/pyside6/tests/QtCore/bug_PYSIDE-164.py | 2 +- sources/pyside6/tests/QtCore/deletelater_test.py | 2 +- sources/pyside6/tests/QtCore/qanimationgroup_test.py | 2 +- sources/pyside6/tests/QtCore/qobject_event_filter_test.py | 2 +- sources/pyside6/tests/QtCore/qobject_inherits_test.py | 2 +- sources/pyside6/tests/QtCore/qobject_timer_event_test.py | 2 +- sources/pyside6/tests/QtCore/qslot_object_test.py | 2 +- sources/pyside6/tests/QtCore/qthread_prod_cons_test.py | 2 +- sources/pyside6/tests/QtCore/qthread_signal_test.py | 2 +- sources/pyside6/tests/QtCore/qthread_test.py | 4 ++-- sources/pyside6/tests/QtCore/qtimer_singleshot_test.py | 4 ++-- sources/pyside6/tests/QtCore/qtimer_timeout_test.py | 2 +- sources/pyside6/tests/QtCore/thread_signals_test.py | 2 +- .../tests/QtDataVisualization/datavisualization_test.py | 2 +- sources/pyside6/tests/QtGui/qicon_test.py | 2 +- sources/pyside6/tests/QtGui/qrasterwindow_test.py | 2 +- sources/pyside6/tests/QtGui/timed_app_and_patching_test.py | 2 +- .../pyside6/tests/QtMultimediaWidgets/qmultimediawidgets.py | 2 +- sources/pyside6/tests/QtNetwork/accessManager_test.py | 2 +- sources/pyside6/tests/QtNetwork/bug_446.py | 2 +- sources/pyside6/tests/QtNetwork/dnslookup_test.py | 2 +- sources/pyside6/tests/QtNetwork/udpsocket_test.py | 2 +- sources/pyside6/tests/QtOpenGL/qopenglwindow_test.py | 2 +- sources/pyside6/tests/QtQml/bug_825.py | 2 +- sources/pyside6/tests/QtQml/bug_847.py | 2 +- sources/pyside6/tests/QtQml/bug_926.py | 2 +- sources/pyside6/tests/QtQml/bug_951.py | 2 +- sources/pyside6/tests/QtQml/bug_997.py | 2 +- sources/pyside6/tests/QtQml/connect_python_qml.py | 2 +- sources/pyside6/tests/QtQml/qqmlincubator_incubateWhile.py | 2 +- sources/pyside6/tests/QtQml/qqmlnetwork_test.py | 2 +- sources/pyside6/tests/QtQml/qquickitem_grabToImage.py | 2 +- sources/pyside6/tests/QtQml/registersingletontype.py | 2 +- sources/pyside6/tests/QtQml/registertype.py | 2 +- sources/pyside6/tests/QtSql/bug_1013.py | 4 ++-- sources/pyside6/tests/QtSql/qsqldatabaseandqueries_test.py | 12 ++++++------ .../pyside6/tests/QtStateMachine/qabstracttransition_test.py | 2 +- sources/pyside6/tests/QtStateMachine/qstate_test.py | 2 +- sources/pyside6/tests/QtStateMachine/qstatemachine_test.py | 4 ++-- sources/pyside6/tests/QtTest/qvalidator_test.py | 8 ++++---- sources/pyside6/tests/QtTest/touchevent_test.py | 2 +- sources/pyside6/tests/QtTextToSpeech/qtexttospeech_test.py | 2 +- sources/pyside6/tests/QtUiTools/bug_426.py | 2 +- sources/pyside6/tests/QtUiTools/bug_958.py | 2 +- sources/pyside6/tests/QtWebEngine/web_engine_initialize.py | 2 +- .../tests/QtWebEngineCore/web_engine_custom_scheme.py | 2 +- .../tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py | 2 +- sources/pyside6/tests/QtWidgets/bug_1006.py | 2 +- sources/pyside6/tests/QtWidgets/bug_667.py | 2 +- sources/pyside6/tests/QtWidgets/bug_750.py | 2 +- sources/pyside6/tests/QtWidgets/bug_793.py | 2 +- sources/pyside6/tests/QtWidgets/bug_836.py | 2 +- sources/pyside6/tests/QtWidgets/bug_879.py | 2 +- sources/pyside6/tests/QtWidgets/bug_919.py | 2 +- sources/pyside6/tests/QtWidgets/bug_921.py | 2 +- sources/pyside6/tests/QtWidgets/bug_972.py | 2 +- sources/pyside6/tests/QtWidgets/customproxywidget_test.py | 2 +- sources/pyside6/tests/QtWidgets/paint_event_test.py | 2 +- .../tests/QtWidgets/qabstracttextdocumentlayout_test.py | 2 +- sources/pyside6/tests/QtWidgets/qgraphicsproxywidget_test.py | 2 +- sources/pyside6/tests/QtWidgets/qkeysequenceedit_test.py | 2 +- sources/pyside6/tests/QtWidgets/qlayout_test.py | 2 +- sources/pyside6/tests/QtWidgets/qlistwidget_test.py | 2 +- sources/pyside6/tests/QtWidgets/qmainwindow_test.py | 6 +++--- sources/pyside6/tests/QtWidgets/qpen_test.py | 2 +- sources/pyside6/tests/QtWidgets/qpicture_test.py | 2 +- sources/pyside6/tests/QtWidgets/qpushbutton_test.py | 2 +- sources/pyside6/tests/QtWidgets/qshortcut_test.py | 2 +- sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py | 2 +- .../tests/QtWidgets/virtual_protected_inheritance_test.py | 4 ++-- .../pyside6/tests/QtWidgets/virtual_pure_override_test.py | 2 +- sources/pyside6/tests/manually/bug_841.py | 2 +- sources/pyside6/tests/signals/bug_189.py | 2 +- sources/pyside6/tests/signals/pysignal_test.py | 4 ++-- sources/pyside6/tests/signals/qobject_sender_test.py | 10 +++++----- sources/pyside6/tests/signals/ref02_test.py | 4 ++-- sources/pyside6/tests/signals/ref05_test.py | 2 +- sources/pyside6/tests/signals/ref06_test.py | 2 +- sources/pyside6/tests/signals/signal_across_threads.py | 2 +- sources/pyside6/tests/signals/signal_object_test.py | 4 ++-- .../pyside6/tests/signals/signal_with_primitive_type_test.py | 2 +- 86 files changed, 108 insertions(+), 108 deletions(-) diff --git a/sources/pyside6/tests/Qt3DExtras/qt3dextras_test.py b/sources/pyside6/tests/Qt3DExtras/qt3dextras_test.py index 19fe1a9f0..8d5a95cfc 100644 --- a/sources/pyside6/tests/Qt3DExtras/qt3dextras_test.py +++ b/sources/pyside6/tests/Qt3DExtras/qt3dextras_test.py @@ -159,7 +159,7 @@ class Qt3DExtrasTestCase(UsesQGuiApplication): while not window.isExposed(): self.app.processEvents() QTimer.singleShot(2000, self.app.quit) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtCharts/qcharts_test.py b/sources/pyside6/tests/QtCharts/qcharts_test.py index 07e33218a..2858bf296 100644 --- a/sources/pyside6/tests/QtCharts/qcharts_test.py +++ b/sources/pyside6/tests/QtCharts/qcharts_test.py @@ -65,7 +65,7 @@ class QChartsTestCase(UsesQApplication): chartView.resize(screenSize / 2) chartView.show() QTimer.singleShot(500, self.app.quit) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtCore/bug_1019.py b/sources/pyside6/tests/QtCore/bug_1019.py index f3a37f42c..125951452 100644 --- a/sources/pyside6/tests/QtCore/bug_1019.py +++ b/sources/pyside6/tests/QtCore/bug_1019.py @@ -64,7 +64,7 @@ class TestBug1019 (unittest.TestCase): app = QCoreApplication([]) t = MyTimer2() QTimer.singleShot(0, t.start) - app.exec_() + app.exec() self.assertTrue(t.startCalled) diff --git a/sources/pyside6/tests/QtCore/bug_462.py b/sources/pyside6/tests/QtCore/bug_462.py index 95772b9fd..1d16e2ab9 100644 --- a/sources/pyside6/tests/QtCore/bug_462.py +++ b/sources/pyside6/tests/QtCore/bug_462.py @@ -74,7 +74,7 @@ class CheckForEventsTypes(unittest.TestCase): def testTypes(self): o = MyBaseObject() o.app = QCoreApplication(sys.argv) - o.app.exec_() + o.app.exec() for e in o.events: self.assertTrue(isinstance(e, MyEvent)) o.app = None diff --git a/sources/pyside6/tests/QtCore/bug_953.py b/sources/pyside6/tests/QtCore/bug_953.py index 39f27cfe0..0a8c3bdcb 100644 --- a/sources/pyside6/tests/QtCore/bug_953.py +++ b/sources/pyside6/tests/QtCore/bug_953.py @@ -54,4 +54,4 @@ class Dispatcher(QObject): if __name__ == '__main__': app = QCoreApplication([]) Dispatcher() - app.exec_() + app.exec() diff --git a/sources/pyside6/tests/QtCore/bug_PYSIDE-164.py b/sources/pyside6/tests/QtCore/bug_PYSIDE-164.py index 36e9bd27d..170444fd8 100644 --- a/sources/pyside6/tests/QtCore/bug_PYSIDE-164.py +++ b/sources/pyside6/tests/QtCore/bug_PYSIDE-164.py @@ -68,7 +68,7 @@ class TestBugPYSIDE164(unittest.TestCase): emitter.connect(emitter, SIGNAL("signal(int)"), receiver.receive, Qt.BlockingQueuedConnection) emitter.start() - retval = eventloop.exec_() + retval = eventloop.exec() emitter.wait(2000) self.assertEqual(retval, 0) diff --git a/sources/pyside6/tests/QtCore/deletelater_test.py b/sources/pyside6/tests/QtCore/deletelater_test.py index 96927780d..033b0cc70 100644 --- a/sources/pyside6/tests/QtCore/deletelater_test.py +++ b/sources/pyside6/tests/QtCore/deletelater_test.py @@ -51,7 +51,7 @@ class TestDeleteLater(UsesQCoreApplication): o.deleteLater() del o QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtCore/qanimationgroup_test.py b/sources/pyside6/tests/QtCore/qanimationgroup_test.py index 0e623de17..972571ac6 100644 --- a/sources/pyside6/tests/QtCore/qanimationgroup_test.py +++ b/sources/pyside6/tests/QtCore/qanimationgroup_test.py @@ -56,7 +56,7 @@ class QAnimationGroupTest(unittest.TestCase): self.assertRaises(RuntimeError, lambda: sanim.parent()) QTimer.singleShot(100, app.quit) - app.exec_() + app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtCore/qobject_event_filter_test.py b/sources/pyside6/tests/QtCore/qobject_event_filter_test.py index c45ba1c73..362982000 100644 --- a/sources/pyside6/tests/QtCore/qobject_event_filter_test.py +++ b/sources/pyside6/tests/QtCore/qobject_event_filter_test.py @@ -110,7 +110,7 @@ class TestQObjectEventFilterPython(UsesQCoreApplication): filtered.startTimer(0) - self.app.exec_() + self.app.exec() self.assertEqual(filtered.times_called, 5) self.assertEqual(self.obj_filter.events_handled, 5) diff --git a/sources/pyside6/tests/QtCore/qobject_inherits_test.py b/sources/pyside6/tests/QtCore/qobject_inherits_test.py index 3246f0b77..e2577fd40 100644 --- a/sources/pyside6/tests/QtCore/qobject_inherits_test.py +++ b/sources/pyside6/tests/QtCore/qobject_inherits_test.py @@ -127,7 +127,7 @@ class InheritsCase(unittest.TestCase): del child self.assertTrue(is_alive) QTimer.singleShot(100, app.quit) - app.exec_() + app.exec() self.assertFalse(is_alive) diff --git a/sources/pyside6/tests/QtCore/qobject_timer_event_test.py b/sources/pyside6/tests/QtCore/qobject_timer_event_test.py index 8a7f4da7b..f6fc2e080 100644 --- a/sources/pyside6/tests/QtCore/qobject_timer_event_test.py +++ b/sources/pyside6/tests/QtCore/qobject_timer_event_test.py @@ -74,7 +74,7 @@ class QObjectTimerEvent(UsesQCoreApplication): # QObject.timerEvent overloading obj = Dummy(self.app) timer_id = obj.startTimer(200) - self.app.exec_() + self.app.exec() obj.killTimer(timer_id) self.assertEqual(obj.times_called, 5) diff --git a/sources/pyside6/tests/QtCore/qslot_object_test.py b/sources/pyside6/tests/QtCore/qslot_object_test.py index f08791be2..36368ae3d 100644 --- a/sources/pyside6/tests/QtCore/qslot_object_test.py +++ b/sources/pyside6/tests/QtCore/qslot_object_test.py @@ -71,7 +71,7 @@ class slotTest(unittest.TestCase): timer.start(100) QTimer.singleShot(1000, self.quit_app) - qApp.exec_() + qApp.exec() self.assertTrue(my_obj.ok) diff --git a/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py b/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py index 4b36b7063..3d22f2f8c 100644 --- a/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py +++ b/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py @@ -133,7 +133,7 @@ class ProducerConsumer(unittest.TestCase): QObject.connect(prod, SIGNAL('finished()'), self.finishCb) QObject.connect(cons, SIGNAL('finished()'), self.finishCb) - self.app.exec_() + self.app.exec() prod.wait(50) cons.wait(50) diff --git a/sources/pyside6/tests/QtCore/qthread_signal_test.py b/sources/pyside6/tests/QtCore/qthread_signal_test.py index d105e93f3..87bd85b73 100644 --- a/sources/pyside6/tests/QtCore/qthread_signal_test.py +++ b/sources/pyside6/tests/QtCore/qthread_signal_test.py @@ -91,7 +91,7 @@ class BasicConnection(unittest.TestCase): source.emit_sig() - app.exec_() + app.exec() thread.wait() self.assertTrue(thread.target.called) diff --git a/sources/pyside6/tests/QtCore/qthread_test.py b/sources/pyside6/tests/QtCore/qthread_test.py index 25ef5d665..a08b0d777 100644 --- a/sources/pyside6/tests/QtCore/qthread_test.py +++ b/sources/pyside6/tests/QtCore/qthread_test.py @@ -97,7 +97,7 @@ class QThreadSimpleCase(UsesQCoreApplication): self._thread = obj QTimer.singleShot(1000, self.abort_application) - self.app.exec_() + self.app.exec() self.assertTrue(self.called) @@ -109,7 +109,7 @@ class QThreadSimpleCase(UsesQCoreApplication): self._thread = obj QTimer.singleShot(1000, self.abort_application) - self.app.exec_() + self.app.exec() self.assertEqual(obj.qobj.thread(), obj) # test QObject.thread() method self.assertTrue(self.called) diff --git a/sources/pyside6/tests/QtCore/qtimer_singleshot_test.py b/sources/pyside6/tests/QtCore/qtimer_singleshot_test.py index 56d02014b..7aa315e17 100644 --- a/sources/pyside6/tests/QtCore/qtimer_singleshot_test.py +++ b/sources/pyside6/tests/QtCore/qtimer_singleshot_test.py @@ -78,7 +78,7 @@ class TestSingleShot(UsesQCoreApplication): def testSingleShot(self): QTimer.singleShot(100, self.callback) - self.app.exec_() + self.app.exec() self.assertTrue(self.called) @@ -108,7 +108,7 @@ class TestSingleShotSignal(UsesQCoreApplication): emitter = SigEmitter() emitter.sig1.connect(self.callback) QTimer.singleShot(100, emitter.sig1) - self.app.exec_() + self.app.exec() self.assertTrue(self.called) diff --git a/sources/pyside6/tests/QtCore/qtimer_timeout_test.py b/sources/pyside6/tests/QtCore/qtimer_timeout_test.py index a183d8dd1..38f4bb20e 100644 --- a/sources/pyside6/tests/QtCore/qtimer_timeout_test.py +++ b/sources/pyside6/tests/QtCore/qtimer_timeout_test.py @@ -83,7 +83,7 @@ class TestTimeoutSignal(UsesQCoreApplication): self.timer.start(4) self.watchdog.startTimer(10) - self.app.exec_() + self.app.exec() self.assertTrue(self.called) self.assertEqual(sys.getrefcount(self.timer), refCount) diff --git a/sources/pyside6/tests/QtCore/thread_signals_test.py b/sources/pyside6/tests/QtCore/thread_signals_test.py index 0aaa251bb..ffbde53b4 100644 --- a/sources/pyside6/tests/QtCore/thread_signals_test.py +++ b/sources/pyside6/tests/QtCore/thread_signals_test.py @@ -61,7 +61,7 @@ class TestThreadSignal(UsesQCoreApplication): QObject.connect(t, SIGNAL("test(const QString&)"), self._callback) t.start() - self.app.exec_() + self.app.exec() t.wait() self.assertTrue(self.__called__) diff --git a/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py index 7e4c343ff..9c3ecc17b 100644 --- a/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py +++ b/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py @@ -92,7 +92,7 @@ class QtDataVisualizationTestCase(UsesQGuiApplication): self.bars.show() QTimer.singleShot(500, self.app.quit) - self.app.exec_() + self.app.exec() def testBarDataProxy(self): '''PSYSIDE-1438, crashes in QBarDataProxy.addRow()''' diff --git a/sources/pyside6/tests/QtGui/qicon_test.py b/sources/pyside6/tests/QtGui/qicon_test.py index a7a1d6bf7..1387ff76b 100644 --- a/sources/pyside6/tests/QtGui/qicon_test.py +++ b/sources/pyside6/tests/QtGui/qicon_test.py @@ -45,7 +45,7 @@ class QIconCtorWithNoneTest(TimedQApplication): def testQIconCtorWithNone(self): icon = QIcon(None) pixmap = icon.pixmap(48, 48) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtGui/qrasterwindow_test.py b/sources/pyside6/tests/QtGui/qrasterwindow_test.py index 03a8701f0..6bd5aadce 100644 --- a/sources/pyside6/tests/QtGui/qrasterwindow_test.py +++ b/sources/pyside6/tests/QtGui/qrasterwindow_test.py @@ -62,7 +62,7 @@ class QRasterWindowTest(UsesQApplication): rasterWindow.resize(QSize(400, 400)) rasterWindow.show() QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtGui/timed_app_and_patching_test.py b/sources/pyside6/tests/QtGui/timed_app_and_patching_test.py index 4dcdea57b..74a2ed58e 100644 --- a/sources/pyside6/tests/QtGui/timed_app_and_patching_test.py +++ b/sources/pyside6/tests/QtGui/timed_app_and_patching_test.py @@ -46,7 +46,7 @@ class TestTimedApp(TimedQApplication): def testFoo(self): # Simple test of TimedQApplication - self.app.exec_() + self.app.exec() def fix_for_QtGui(QtGui): diff --git a/sources/pyside6/tests/QtMultimediaWidgets/qmultimediawidgets.py b/sources/pyside6/tests/QtMultimediaWidgets/qmultimediawidgets.py index ac0b14695..2bb0673fb 100644 --- a/sources/pyside6/tests/QtMultimediaWidgets/qmultimediawidgets.py +++ b/sources/pyside6/tests/QtMultimediaWidgets/qmultimediawidgets.py @@ -62,7 +62,7 @@ class QMultimediaWidgetsTest(UsesQApplication): w.show() timer = QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtNetwork/accessManager_test.py b/sources/pyside6/tests/QtNetwork/accessManager_test.py index 0727400ca..bb4fe33b0 100644 --- a/sources/pyside6/tests/QtNetwork/accessManager_test.py +++ b/sources/pyside6/tests/QtNetwork/accessManager_test.py @@ -72,7 +72,7 @@ class AccessManagerCase(UsesQCoreApplication): manager.finished.connect(self.slot_replyFinished) port = self.httpd.port() manager.get(QNetworkRequest(QUrl(f"http://127.0.0.1:{port}"))) - self.app.exec_() + self.app.exec() self.assertTrue(self.called) diff --git a/sources/pyside6/tests/QtNetwork/bug_446.py b/sources/pyside6/tests/QtNetwork/bug_446.py index 9d0b7a038..eb8ab7a4a 100644 --- a/sources/pyside6/tests/QtNetwork/bug_446.py +++ b/sources/pyside6/tests/QtNetwork/bug_446.py @@ -76,7 +76,7 @@ class HttpSignalsCase(UsesQCoreApplication): def testRun(self): self.initServer() - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtNetwork/dnslookup_test.py b/sources/pyside6/tests/QtNetwork/dnslookup_test.py index 68698f7a5..21a128c75 100644 --- a/sources/pyside6/tests/QtNetwork/dnslookup_test.py +++ b/sources/pyside6/tests/QtNetwork/dnslookup_test.py @@ -61,7 +61,7 @@ class DnsLookupTestCase(unittest.TestCase): def testLookup(self): self._lookup.lookup() - self._app.exec_() + self._app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtNetwork/udpsocket_test.py b/sources/pyside6/tests/QtNetwork/udpsocket_test.py index d4a31c044..8b806170e 100644 --- a/sources/pyside6/tests/QtNetwork/udpsocket_test.py +++ b/sources/pyside6/tests/QtNetwork/udpsocket_test.py @@ -78,7 +78,7 @@ class HttpSignalsCase(unittest.TestCase): # @bug 124 QObject.connect(self.server, SIGNAL('readyRead()'), self.callback) self.sendPackage() - self.app.exec_() + self.app.exec() self.assertTrue(self.called) diff --git a/sources/pyside6/tests/QtOpenGL/qopenglwindow_test.py b/sources/pyside6/tests/QtOpenGL/qopenglwindow_test.py index 87b0d7e49..61367286d 100644 --- a/sources/pyside6/tests/QtOpenGL/qopenglwindow_test.py +++ b/sources/pyside6/tests/QtOpenGL/qopenglwindow_test.py @@ -108,7 +108,7 @@ class QOpenGLWindowTest(UsesQApplication): openGlWindow.resize(640, 480) openGlWindow.show() QTimer.singleShot(100, openGlWindow.close) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtQml/bug_825.py b/sources/pyside6/tests/QtQml/bug_825.py index 3deebe6d0..55d2e2514 100644 --- a/sources/pyside6/tests/QtQml/bug_825.py +++ b/sources/pyside6/tests/QtQml/bug_825.py @@ -92,7 +92,7 @@ class TestBug825 (unittest.TestCase): self.assertTrue(view.rootObject(), quickview_errorstring(view)) view.show() QTimer.singleShot(250, view.close) - app.exec_() + app.exec() self.assertTrue(paintCalled) diff --git a/sources/pyside6/tests/QtQml/bug_847.py b/sources/pyside6/tests/QtQml/bug_847.py index d4c9f9faf..256320b1e 100644 --- a/sources/pyside6/tests/QtQml/bug_847.py +++ b/sources/pyside6/tests/QtQml/bug_847.py @@ -88,7 +88,7 @@ class TestQML(UsesQApplication): # Essentially a timeout in case method invocation fails. QTimer.singleShot(30000, QCoreApplication.instance().quit) - self.app.exec_() + self.app.exec() self.assertTrue(self._sucess) diff --git a/sources/pyside6/tests/QtQml/bug_926.py b/sources/pyside6/tests/QtQml/bug_926.py index e8ac50858..9dad2e92c 100644 --- a/sources/pyside6/tests/QtQml/bug_926.py +++ b/sources/pyside6/tests/QtQml/bug_926.py @@ -75,7 +75,7 @@ class TestBug926 (unittest.TestCase): view.show() QTimer.singleShot(0, app.quit) - app.exec_() + app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtQml/bug_951.py b/sources/pyside6/tests/QtQml/bug_951.py index 9a75550a8..3a121a0e6 100644 --- a/sources/pyside6/tests/QtQml/bug_951.py +++ b/sources/pyside6/tests/QtQml/bug_951.py @@ -68,7 +68,7 @@ class TestRegisterQMLType(TimedQApplication): view.setSource(QUrl.fromLocalFile(os.fspath(file))) self.assertTrue(view.rootObject(), quickview_errorstring(view)) - self.app.exec_() + self.app.exec() self.assertTrue(MyItem.COMPONENT_COMPLETE_CALLED) diff --git a/sources/pyside6/tests/QtQml/bug_997.py b/sources/pyside6/tests/QtQml/bug_997.py index 18fbfcb63..44c2a7ade 100644 --- a/sources/pyside6/tests/QtQml/bug_997.py +++ b/sources/pyside6/tests/QtQml/bug_997.py @@ -58,7 +58,7 @@ class TestBug(UsesQApplication): self.assertTrue(view.rootObject(), quickview_errorstring(view)) view.show() QTimer.singleShot(1000, self.app.quit) - self.app.exec_() + self.app.exec() self.assertEqual(ownerData.value('newName'), ownerData.value('name')) diff --git a/sources/pyside6/tests/QtQml/connect_python_qml.py b/sources/pyside6/tests/QtQml/connect_python_qml.py index c24346620..77a4947c2 100644 --- a/sources/pyside6/tests/QtQml/connect_python_qml.py +++ b/sources/pyside6/tests/QtQml/connect_python_qml.py @@ -71,7 +71,7 @@ class TestConnectionWithInvalidSignature(TimedQApplication): button.entered.connect(self.onButtonClicked) button.entered.emit() view.show() - self.app.exec_() + self.app.exec() self.assertTrue(self.buttonClicked) diff --git a/sources/pyside6/tests/QtQml/qqmlincubator_incubateWhile.py b/sources/pyside6/tests/QtQml/qqmlincubator_incubateWhile.py index 11e666c08..8a0fccf45 100644 --- a/sources/pyside6/tests/QtQml/qqmlincubator_incubateWhile.py +++ b/sources/pyside6/tests/QtQml/qqmlincubator_incubateWhile.py @@ -87,7 +87,7 @@ class TestBug(unittest.TestCase): root = view.rootObject() # The QML code will issue an interrupt signal after half of its items are loaded. root.shouldInterrupt.connect(controller.interrupter) - res = app.exec_() + res = app.exec() itemsToCreate = root.property("itemsToCreate") loadedItems = root.property("loadedItems") diff --git a/sources/pyside6/tests/QtQml/qqmlnetwork_test.py b/sources/pyside6/tests/QtQml/qqmlnetwork_test.py index 75de98b9e..8ab4dca0e 100644 --- a/sources/pyside6/tests/QtQml/qqmlnetwork_test.py +++ b/sources/pyside6/tests/QtQml/qqmlnetwork_test.py @@ -76,7 +76,7 @@ class TestQQmlNetworkFactory(TimedQApplication): self.assertEqual(view.status(), QQuickView.Ready) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtQml/qquickitem_grabToImage.py b/sources/pyside6/tests/QtQml/qquickitem_grabToImage.py index 2843c0a92..df88f6d99 100644 --- a/sources/pyside6/tests/QtQml/qquickitem_grabToImage.py +++ b/sources/pyside6/tests/QtQml/qquickitem_grabToImage.py @@ -77,7 +77,7 @@ class TestGrabToSharedPointerImage(TimedQApplication): # Wait for signal when grabbing is complete. grabResultSharedPtr.ready.connect(onGrabReady) - self.app.exec_() + self.app.exec() # Get the first pixel color of the grabbed image. self.image = grabResultSharedPtr.image() diff --git a/sources/pyside6/tests/QtQml/registersingletontype.py b/sources/pyside6/tests/QtQml/registersingletontype.py index 01b841675..65fb96c01 100644 --- a/sources/pyside6/tests/QtQml/registersingletontype.py +++ b/sources/pyside6/tests/QtQml/registersingletontype.py @@ -87,7 +87,7 @@ class TestQmlSupport(unittest.TestCase): self.assertTrue(view.rootObject(), quickview_errorstring(view)) view.show() QTimer.singleShot(250, view.close) - app.exec_() + app.exec() self.assertEqual(finalResult, 200) diff --git a/sources/pyside6/tests/QtQml/registertype.py b/sources/pyside6/tests/QtQml/registertype.py index 254208dcb..53d5b8542 100644 --- a/sources/pyside6/tests/QtQml/registertype.py +++ b/sources/pyside6/tests/QtQml/registertype.py @@ -125,7 +125,7 @@ class TestQmlSupport(unittest.TestCase): self.assertTrue(view.rootObject(), quickview_errorstring(view)) view.show() QTimer.singleShot(250, view.close) - app.exec_() + app.exec() self.assertTrue(appendCalled) self.assertTrue(paintCalled) diff --git a/sources/pyside6/tests/QtSql/bug_1013.py b/sources/pyside6/tests/QtSql/bug_1013.py index 17a86876d..cdd0ea603 100644 --- a/sources/pyside6/tests/QtSql/bug_1013.py +++ b/sources/pyside6/tests/QtSql/bug_1013.py @@ -51,7 +51,7 @@ class TestBug1013 (unittest.TestCase): db.setDatabaseName(':memory:') db.open() query = QSqlQuery() - query.exec_('CREATE TABLE "foo" (id INT);') + query.exec('CREATE TABLE "foo" (id INT);') model = QSqlTableModel() model.setTable('foo') @@ -59,7 +59,7 @@ class TestBug1013 (unittest.TestCase): model.primeInsert.connect(self.someSlot) model.select() QTimer.singleShot(0, lambda: model.insertRow(0) and app.quit()) - app.exec_() + app.exec() self.assertTrue(self._wasCalled) self.assertEqual(model.data(model.index(0, 0)), 2) diff --git a/sources/pyside6/tests/QtSql/qsqldatabaseandqueries_test.py b/sources/pyside6/tests/QtSql/qsqldatabaseandqueries_test.py index 6ea020a16..13abb1cd1 100644 --- a/sources/pyside6/tests/QtSql/qsqldatabaseandqueries_test.py +++ b/sources/pyside6/tests/QtSql/qsqldatabaseandqueries_test.py @@ -70,25 +70,25 @@ class SqlDatabaseCreationDestructionAndQueries(unittest.TestCase): def testTableCreationAndDestruction(self): # Test table creation and destruction query = QSqlQuery() - query.exec_("CREATE TABLE dummy(id int primary key, dummyfield varchar(20))") - query.exec_("DROP TABLE dummy") + query.exec("CREATE TABLE dummy(id int primary key, dummyfield varchar(20))") + query.exec("DROP TABLE dummy") query.clear() def testTableInsertionAndRetrieval(self): # Test table creation, insertion and retrieval query = QSqlQuery() - query.exec_("CREATE TABLE person(id int primary key, " + query.exec("CREATE TABLE person(id int primary key, " "firstname varchar(20), lastname varchar(20))") - query.exec_("INSERT INTO person VALUES(101, 'George', 'Harrison')") + query.exec("INSERT INTO person VALUES(101, 'George', 'Harrison')") query.prepare("INSERT INTO person (id, firstname, lastname) " "VALUES (:id, :firstname, :lastname)") query.bindValue(":id", 102) query.bindValue(":firstname", "John") query.bindValue(":lastname", "Lennon") - query.exec_() + query.exec() lastname = '' - query.exec_("SELECT lastname FROM person where id=101") + query.exec("SELECT lastname FROM person where id=101") self.assertTrue(query.isActive()) query.next() lastname = query.value(0) diff --git a/sources/pyside6/tests/QtStateMachine/qabstracttransition_test.py b/sources/pyside6/tests/QtStateMachine/qabstracttransition_test.py index 6b75d6b32..8c9fe6904 100644 --- a/sources/pyside6/tests/QtStateMachine/qabstracttransition_test.py +++ b/sources/pyside6/tests/QtStateMachine/qabstracttransition_test.py @@ -89,7 +89,7 @@ class QAbstractTransitionTest(unittest.TestCase): machine.start() QTimer.singleShot(100, app.quit) - app.exec_() + app.exec() def testRefCountOfTargetState(self): transition = QEventTransition() diff --git a/sources/pyside6/tests/QtStateMachine/qstate_test.py b/sources/pyside6/tests/QtStateMachine/qstate_test.py index 618c8d3e6..b00ce94b8 100644 --- a/sources/pyside6/tests/QtStateMachine/qstate_test.py +++ b/sources/pyside6/tests/QtStateMachine/qstate_test.py @@ -65,7 +65,7 @@ class QStateTest(unittest.TestCase): o.emit(SIGNAL("change()")) QTimer.singleShot(100, app.quit) - app.exec_() + app.exec() txt = o.property("text") self.assertTrue(txt, "Rocks") diff --git a/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py b/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py index 751743027..71cfb558f 100644 --- a/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py +++ b/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py @@ -67,7 +67,7 @@ class QStateMachineTest(UsesQCoreApplication): self.machine.start() QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() class QSetConverterTest(UsesQCoreApplication): @@ -82,7 +82,7 @@ class QSetConverterTest(UsesQCoreApplication): machine.start() QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() configuration = machine.configuration() diff --git a/sources/pyside6/tests/QtTest/qvalidator_test.py b/sources/pyside6/tests/QtTest/qvalidator_test.py index a5066de25..4ee1036f3 100644 --- a/sources/pyside6/tests/QtTest/qvalidator_test.py +++ b/sources/pyside6/tests/QtTest/qvalidator_test.py @@ -93,7 +93,7 @@ class QValidatorTest(UsesQApplication): line.setText("foo") QTimer.singleShot(0, line.close) - self.app.exec_() + self.app.exec() self.assertEqual(line.text(), "fixed") self.assertEqual(line.cursorPosition(), 1) @@ -105,7 +105,7 @@ class QValidatorTest(UsesQApplication): line.setText("foo") QTimer.singleShot(0, line.close) - self.app.exec_() + self.app.exec() self.assertEqual(line.text(), "fixed") self.assertEqual(line.cursorPosition(), 3) @@ -117,7 +117,7 @@ class QValidatorTest(UsesQApplication): line.setText("foo") QTimer.singleShot(0, line.close) - self.app.exec_() + self.app.exec() self.assertEqual(line.text(), "foo") self.assertEqual(line.cursorPosition(), 3) @@ -129,7 +129,7 @@ class QValidatorTest(UsesQApplication): line.setText("foo") QTimer.singleShot(0, line.close) - self.app.exec_() + self.app.exec() self.assertEqual(line.text(), "foo") self.assertEqual(line.cursorPosition(), 3) diff --git a/sources/pyside6/tests/QtTest/touchevent_test.py b/sources/pyside6/tests/QtTest/touchevent_test.py index 1cf127909..f6e264601 100644 --- a/sources/pyside6/tests/QtTest/touchevent_test.py +++ b/sources/pyside6/tests/QtTest/touchevent_test.py @@ -74,7 +74,7 @@ class TouchEventTest(UsesQApplication): def testCreateEvent(self): w = MyWidget() w.show() - self.app.exec_() + self.app.exec() # same values as C++ self.assertEqual(w._sequence.count(QEvent.Type.TouchBegin), 2) self.assertEqual(w._sequence.count(QEvent.Type.TouchUpdate), 2) diff --git a/sources/pyside6/tests/QtTextToSpeech/qtexttospeech_test.py b/sources/pyside6/tests/QtTextToSpeech/qtexttospeech_test.py index 94154f7f6..bae376b38 100644 --- a/sources/pyside6/tests/QtTextToSpeech/qtexttospeech_test.py +++ b/sources/pyside6/tests/QtTextToSpeech/qtexttospeech_test.py @@ -61,7 +61,7 @@ class QTextToSpeechTestCase(UsesQApplication): speech.stateChanged.connect(self._slotStateChanged) speech.say("Hello, PySide6") QTimer.singleShot(5000, self.app.quit) - self.app.exec_() + self.app.exec() def _slotStateChanged(self, state): if (state == QTextToSpeech.State.Ready): diff --git a/sources/pyside6/tests/QtUiTools/bug_426.py b/sources/pyside6/tests/QtUiTools/bug_426.py index 3fdc9bec4..65d754ca3 100644 --- a/sources/pyside6/tests/QtUiTools/bug_426.py +++ b/sources/pyside6/tests/QtUiTools/bug_426.py @@ -54,4 +54,4 @@ class Window(object): if __name__ == "__main__": app = QApplication(sys.argv) win = Window() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/sources/pyside6/tests/QtUiTools/bug_958.py b/sources/pyside6/tests/QtUiTools/bug_958.py index 74c4a18ea..d56424b7b 100644 --- a/sources/pyside6/tests/QtUiTools/bug_958.py +++ b/sources/pyside6/tests/QtUiTools/bug_958.py @@ -58,7 +58,7 @@ class BugTest(TimedQApplication): def testCase(self): lMain = Gui_Qt() lMain.show() - self.app.exec_() + self.app.exec() if __name__ == "__main__": diff --git a/sources/pyside6/tests/QtWebEngine/web_engine_initialize.py b/sources/pyside6/tests/QtWebEngine/web_engine_initialize.py index df31a87c5..be9ac0e40 100644 --- a/sources/pyside6/tests/QtWebEngine/web_engine_initialize.py +++ b/sources/pyside6/tests/QtWebEngine/web_engine_initialize.py @@ -45,7 +45,7 @@ class MainTest(unittest.TestCase): app = QApplication([]) QtWebEngine.initialize() QTimer.singleShot(2000, app.quit) - app.exec_() + app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtWebEngineCore/web_engine_custom_scheme.py b/sources/pyside6/tests/QtWebEngineCore/web_engine_custom_scheme.py index a51d824fb..ab1c4f706 100644 --- a/sources/pyside6/tests/QtWebEngineCore/web_engine_custom_scheme.py +++ b/sources/pyside6/tests/QtWebEngineCore/web_engine_custom_scheme.py @@ -83,7 +83,7 @@ class MainTest(unittest.TestCase): top_level_widget.show() view.load("testpy:hello") - app.exec_() + app.exec() self.assertTrue(self._loaded) self.assertEqual(view.url(), "testpy:goodbye") diff --git a/sources/pyside6/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py b/sources/pyside6/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py index e1a32668d..7eef5c059 100644 --- a/sources/pyside6/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py +++ b/sources/pyside6/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py @@ -56,7 +56,7 @@ class MainTest(unittest.TestCase): self._callback_count = 0 layout.addWidget(self._view) top_level.show() - app.exec_() + app.exec() def found_callback(self, found): self.assertTrue(found) diff --git a/sources/pyside6/tests/QtWidgets/bug_1006.py b/sources/pyside6/tests/QtWidgets/bug_1006.py index 7aaff11c1..9a1b7e653 100644 --- a/sources/pyside6/tests/QtWidgets/bug_1006.py +++ b/sources/pyside6/tests/QtWidgets/bug_1006.py @@ -76,7 +76,7 @@ class TestBug1006 (TimedQApplication): window = LabelWindow(None) window.replace(self) self.assertTrue(window._destroyCalled) - self.app.exec_() + self.app.exec() def testParentLayout(self): def createLayout(): diff --git a/sources/pyside6/tests/QtWidgets/bug_667.py b/sources/pyside6/tests/QtWidgets/bug_667.py index 42f9dade3..03f125c6a 100644 --- a/sources/pyside6/tests/QtWidgets/bug_667.py +++ b/sources/pyside6/tests/QtWidgets/bug_667.py @@ -59,4 +59,4 @@ if __name__ == "__main__": w.show() w.raise_() QTimer.singleShot(0, w.close) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/sources/pyside6/tests/QtWidgets/bug_750.py b/sources/pyside6/tests/QtWidgets/bug_750.py index 111204bf9..08327a0d0 100644 --- a/sources/pyside6/tests/QtWidgets/bug_750.py +++ b/sources/pyside6/tests/QtWidgets/bug_750.py @@ -55,7 +55,7 @@ class TestQPainter(UsesQApplication): w._app = self.app w._info = None QTimer.singleShot(300, w.show) - self.app.exec_() + self.app.exec() self.assertTrue(w._info) diff --git a/sources/pyside6/tests/QtWidgets/bug_793.py b/sources/pyside6/tests/QtWidgets/bug_793.py index 40e3f85da..2a87a8750 100644 --- a/sources/pyside6/tests/QtWidgets/bug_793.py +++ b/sources/pyside6/tests/QtWidgets/bug_793.py @@ -67,4 +67,4 @@ class TestQApplicationDestrcutor(unittest.TestCase): if __name__ == '__main__': app = QApplication(sys.argv) unittest.main() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/sources/pyside6/tests/QtWidgets/bug_836.py b/sources/pyside6/tests/QtWidgets/bug_836.py index fe381a570..7df90e7a7 100644 --- a/sources/pyside6/tests/QtWidgets/bug_836.py +++ b/sources/pyside6/tests/QtWidgets/bug_836.py @@ -62,7 +62,7 @@ def main(): w = MainWindow() w.show() QTimer.singleShot(0, w.close) - app.exec_() + app.exec() if __name__ == "__main__": diff --git a/sources/pyside6/tests/QtWidgets/bug_879.py b/sources/pyside6/tests/QtWidgets/bug_879.py index 8a7b4b184..435cc4190 100644 --- a/sources/pyside6/tests/QtWidgets/bug_879.py +++ b/sources/pyside6/tests/QtWidgets/bug_879.py @@ -55,7 +55,7 @@ class TestBug879 (unittest.TestCase): QTimer.singleShot(0, self.sendKbdEvent) QTimer.singleShot(100, app.quit) - app.exec_() + app.exec() self.assertEqual(self.box.text(), '0') diff --git a/sources/pyside6/tests/QtWidgets/bug_919.py b/sources/pyside6/tests/QtWidgets/bug_919.py index f4d5311fd..1ca2c220b 100644 --- a/sources/pyside6/tests/QtWidgets/bug_919.py +++ b/sources/pyside6/tests/QtWidgets/bug_919.py @@ -68,7 +68,7 @@ class TestBug919(TimedQApplication): w = MyWidget() w.paintReceived.connect(self.app.quit) w.show() - self.app.exec_() + self.app.exec() self.assertTrue(w._painted) diff --git a/sources/pyside6/tests/QtWidgets/bug_921.py b/sources/pyside6/tests/QtWidgets/bug_921.py index d27ce774d..35752e273 100644 --- a/sources/pyside6/tests/QtWidgets/bug_921.py +++ b/sources/pyside6/tests/QtWidgets/bug_921.py @@ -78,7 +78,7 @@ class TestTimedApp(TimedQApplication): s.s3.connect(internalFunction) midleFunction() - self.app.exec_() + self.app.exec() del w s.s1.emit() diff --git a/sources/pyside6/tests/QtWidgets/bug_972.py b/sources/pyside6/tests/QtWidgets/bug_972.py index 24f892f19..fe6662ee9 100644 --- a/sources/pyside6/tests/QtWidgets/bug_972.py +++ b/sources/pyside6/tests/QtWidgets/bug_972.py @@ -70,7 +70,7 @@ class TestBug972 (TimedQApplication): view = QGraphicsView(scene) view.show() - self.app.exec_() + self.app.exec() if __name__ == "__main__": diff --git a/sources/pyside6/tests/QtWidgets/customproxywidget_test.py b/sources/pyside6/tests/QtWidgets/customproxywidget_test.py index db4da7884..1e7351dc3 100644 --- a/sources/pyside6/tests/QtWidgets/customproxywidget_test.py +++ b/sources/pyside6/tests/QtWidgets/customproxywidget_test.py @@ -64,7 +64,7 @@ class CustomProxyWidgetTest(UsesQApplication): view.show() timer = QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtWidgets/paint_event_test.py b/sources/pyside6/tests/QtWidgets/paint_event_test.py index 48d999901..66dd3d084 100644 --- a/sources/pyside6/tests/QtWidgets/paint_event_test.py +++ b/sources/pyside6/tests/QtWidgets/paint_event_test.py @@ -94,7 +94,7 @@ class PaintEventOverride(UsesQApplication): # Test QWidget.paintEvent override timer_id = self.widget.startTimer(100) self.widget.show() - self.app.exec_() + self.app.exec() self.widget.killTimer(timer_id) diff --git a/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py b/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py index b6d443bdb..7d4f5c786 100644 --- a/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py +++ b/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py @@ -74,7 +74,7 @@ class QAbstractTextDocumentLayoutTest(UsesQApplication): self.textEdit.document().documentLayout().registerHandler(QAbstractTextDocumentLayoutTest.objectType, interface) QTimer.singleShot(0, self.foo) - self.app.exec_() + self.app.exec() self.assertTrue(Foo.called) diff --git a/sources/pyside6/tests/QtWidgets/qgraphicsproxywidget_test.py b/sources/pyside6/tests/QtWidgets/qgraphicsproxywidget_test.py index ef78f83f7..63ac4d791 100644 --- a/sources/pyside6/tests/QtWidgets/qgraphicsproxywidget_test.py +++ b/sources/pyside6/tests/QtWidgets/qgraphicsproxywidget_test.py @@ -59,7 +59,7 @@ class QGraphicsProxyWidgetTest(UsesQApplication): view.show() timer = QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtWidgets/qkeysequenceedit_test.py b/sources/pyside6/tests/QtWidgets/qkeysequenceedit_test.py index cd629430f..789607231 100644 --- a/sources/pyside6/tests/QtWidgets/qkeysequenceedit_test.py +++ b/sources/pyside6/tests/QtWidgets/qkeysequenceedit_test.py @@ -48,7 +48,7 @@ class QKeySequenceEditTest(UsesQApplication): keySequenceEdit = QKeySequenceEdit() keySequenceEdit.show() QTimer.singleShot(0, keySequenceEdit.close) - self.app.exec_() + self.app.exec() print(keySequenceEdit.keySequence()) diff --git a/sources/pyside6/tests/QtWidgets/qlayout_test.py b/sources/pyside6/tests/QtWidgets/qlayout_test.py index fa5e53e4f..4230470b7 100644 --- a/sources/pyside6/tests/QtWidgets/qlayout_test.py +++ b/sources/pyside6/tests/QtWidgets/qlayout_test.py @@ -141,7 +141,7 @@ class QLayoutTest(UsesQApplication): w.setLayout(formLayout) w.show() QTimer.singleShot(10, w.close) - self.app.exec_() + self.app.exec() del w self.assertRaises(RuntimeError, spacer.isEmpty) diff --git a/sources/pyside6/tests/QtWidgets/qlistwidget_test.py b/sources/pyside6/tests/QtWidgets/qlistwidget_test.py index 64fc2f181..3746d3675 100644 --- a/sources/pyside6/tests/QtWidgets/qlistwidget_test.py +++ b/sources/pyside6/tests/QtWidgets/qlistwidget_test.py @@ -83,7 +83,7 @@ class QListWidgetTest(UsesQApplication): lst.addItem(QListWidgetItem("foo")) QTimer.singleShot(0, slot) QTimer.singleShot(0, lst.close) - self.app.exec_() + self.app.exec() self.assertEqual(lst.count(), 1) def testClear(self): diff --git a/sources/pyside6/tests/QtWidgets/qmainwindow_test.py b/sources/pyside6/tests/QtWidgets/qmainwindow_test.py index 017ffbbd0..5d6018b28 100644 --- a/sources/pyside6/tests/QtWidgets/qmainwindow_test.py +++ b/sources/pyside6/tests/QtWidgets/qmainwindow_test.py @@ -68,7 +68,7 @@ class TestMainWindow(UsesQApplication): w = MainWindow() w.show() QTimer.singleShot(1000, self.app.quit) - self.app.exec_() + self.app.exec() def objDel(self, obj): self.app.quit() @@ -82,7 +82,7 @@ class TestMainWindow(UsesQApplication): wr = weakref.ref(c, self.objDel) w.setCentralWidget(None) c = None - self.app.exec_() + self.app.exec() def testRefCountToAnother(self): w = QMainWindow() @@ -99,7 +99,7 @@ class TestMainWindow(UsesQApplication): w.setCentralWidget(None) c = None - self.app.exec_() + self.app.exec() def testSignalDisconect(self): w = QMainWindow() diff --git a/sources/pyside6/tests/QtWidgets/qpen_test.py b/sources/pyside6/tests/QtWidgets/qpen_test.py index 2707fc931..c06102e1c 100644 --- a/sources/pyside6/tests/QtWidgets/qpen_test.py +++ b/sources/pyside6/tests/QtWidgets/qpen_test.py @@ -71,7 +71,7 @@ class QPenTest(UsesQApplication): w = Painting() w.show() QTimer.singleShot(1000, self.app.quit) - self.app.exec_() + self.app.exec() self.assertEqual(w.penFromEnum.style(), Qt.NoPen) self.assertEqual(w.penFromInteger.style(), Qt.SolidLine) diff --git a/sources/pyside6/tests/QtWidgets/qpicture_test.py b/sources/pyside6/tests/QtWidgets/qpicture_test.py index 06364e4be..9e1479dd8 100644 --- a/sources/pyside6/tests/QtWidgets/qpicture_test.py +++ b/sources/pyside6/tests/QtWidgets/qpicture_test.py @@ -67,7 +67,7 @@ class QPictureTest(UsesQApplication): w._app = self.app QTimer.singleShot(300, w.show) - self.app.exec_() + self.app.exec() if __name__ == '__main__': diff --git a/sources/pyside6/tests/QtWidgets/qpushbutton_test.py b/sources/pyside6/tests/QtWidgets/qpushbutton_test.py index 78cfe75da..3b23e1b9c 100644 --- a/sources/pyside6/tests/QtWidgets/qpushbutton_test.py +++ b/sources/pyside6/tests/QtWidgets/qpushbutton_test.py @@ -59,7 +59,7 @@ class QPushButtonTest(UsesQApplication): w.show() timer = QTimer.singleShot(100, self.app.quit) - self.app.exec_() + self.app.exec() def buttonCb(self, checked): self._clicked = True diff --git a/sources/pyside6/tests/QtWidgets/qshortcut_test.py b/sources/pyside6/tests/QtWidgets/qshortcut_test.py index 392f9dff6..b9bed5a72 100644 --- a/sources/pyside6/tests/QtWidgets/qshortcut_test.py +++ b/sources/pyside6/tests/QtWidgets/qshortcut_test.py @@ -74,7 +74,7 @@ class QAppPresence(unittest.TestCase): self.sc = MyShortcut(QKeySequence(Qt.Key_Return), f, f.slot_of_foo) self.scstd = MyShortcut(QKeySequence.Copy, f, f.slot_of_copy) QTimer.singleShot(0, self.init) - self.qapp.exec_() + self.qapp.exec() self.assertEqual(f.ok, True) self.assertEqual(f.copy, True) diff --git a/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py b/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py index ebd49012e..d9813b23a 100644 --- a/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py +++ b/sources/pyside6/tests/QtWidgets/qtreewidgetitem_test.py @@ -68,7 +68,7 @@ class QTreeWidgetItemTest(unittest.TestCase): self.assertTrue(item != item2) treewidget.show() QTimer.singleShot(500, app.quit) - app.exec_() + app.exec() if __name__ == "__main__": diff --git a/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py b/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py index afe09f0c1..c22648551 100644 --- a/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py +++ b/sources/pyside6/tests/QtWidgets/virtual_protected_inheritance_test.py @@ -89,7 +89,7 @@ class TimerEventTest(UsesQApplication): # QWidget.timerEvent overrinding (protected inherited) timer_id = self.widget.startTimer(0) - self.app.exec_() + self.app.exec() self.widget.killTimer(timer_id) @@ -102,5 +102,5 @@ if __name__ == '__main__': #widget = MySpinButton(app=app) #widget.startTimer(500) #widget.show() - #app.exec_() + #app.exec() diff --git a/sources/pyside6/tests/QtWidgets/virtual_pure_override_test.py b/sources/pyside6/tests/QtWidgets/virtual_pure_override_test.py index 8629af5b7..68d366c36 100644 --- a/sources/pyside6/tests/QtWidgets/virtual_pure_override_test.py +++ b/sources/pyside6/tests/QtWidgets/virtual_pure_override_test.py @@ -76,7 +76,7 @@ class QGraphicsItemTest(UsesQApplication): rect = self.createRoundRect(scene) view.show() QTimer.singleShot(1000, self.quit_app) - self.app.exec_() + self.app.exec() self.assertTrue(qgraphics_item_painted) diff --git a/sources/pyside6/tests/manually/bug_841.py b/sources/pyside6/tests/manually/bug_841.py index c3cf10c8b..5742b5517 100644 --- a/sources/pyside6/tests/manually/bug_841.py +++ b/sources/pyside6/tests/manually/bug_841.py @@ -75,7 +75,7 @@ def main(): w = MainWindow() w.show() QMessageBox.information(None, "Info", "Just drag and drop the items.") - sys.exit(app.exec_()) + sys.exit(app.exec()) if __name__ == "__main__": diff --git a/sources/pyside6/tests/signals/bug_189.py b/sources/pyside6/tests/signals/bug_189.py index ef3c0483b..39a1fe042 100644 --- a/sources/pyside6/tests/signals/bug_189.py +++ b/sources/pyside6/tests/signals/bug_189.py @@ -54,7 +54,7 @@ class TestBugPYSIDE189(UsesQApplication): sld.deleteLater() QTimer.singleShot(0, self.app.quit) - self.app.exec_() + self.app.exec() self.assertRaises(RuntimeError, sld.valueChanged.disconnect, onValueChanged) diff --git a/sources/pyside6/tests/signals/pysignal_test.py b/sources/pyside6/tests/signals/pysignal_test.py index 86c05324a..cd7e5f145 100644 --- a/sources/pyside6/tests/signals/pysignal_test.py +++ b/sources/pyside6/tests/signals/pysignal_test.py @@ -100,7 +100,7 @@ class PyObjectType(UsesQApplication): o = Dummy() o.connect(SIGNAL("dummy2(PyObject,PyObject)"), self.mySlot2, Qt.QueuedConnection) o.callDummy2() - self.app.exec_() + self.app.exec() self.assertEqual(self.callCount, 1) def testTwice(self): @@ -110,7 +110,7 @@ class PyObjectType(UsesQApplication): o.connect(SIGNAL("dummy2(PyObject,PyObject)"), self.mySlot2, Qt.QueuedConnection) o.callDummy2() o.callDummy2() - self.app.exec_() + self.app.exec() self.assertEqual(self.callCount, 2) diff --git a/sources/pyside6/tests/signals/qobject_sender_test.py b/sources/pyside6/tests/signals/qobject_sender_test.py index 6ed84a55f..3a817f727 100644 --- a/sources/pyside6/tests/signals/qobject_sender_test.py +++ b/sources/pyside6/tests/signals/qobject_sender_test.py @@ -91,13 +91,13 @@ class ObjectSenderWithQAppTest(UsesQCoreApplication): recv = Receiver() QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) - self.app.exec_() + self.app.exec() self.assertEqual(sender, recv.the_sender) def testSenderCppSignalSingleShotTimer(self): recv = Receiver() QTimer.singleShot(10, recv.callback) - self.app.exec_() + self.app.exec() self.assertTrue(isinstance(recv.the_sender, QObject)) def testSenderCppSignalWithPythonExtendedClass(self): @@ -105,7 +105,7 @@ class ObjectSenderWithQAppTest(UsesQCoreApplication): recv = Receiver() QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) - self.app.exec_() + self.app.exec() self.assertEqual(sender, recv.the_sender) @@ -118,7 +118,7 @@ class ObjectSenderWithQAppCheckOnReceiverTest(UsesQCoreApplication): recv = Receiver() QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) - self.app.exec_() + self.app.exec() self.assertEqual(sender, recv.the_sender) def testSenderCppSignalWithPythonExtendedClass(self): @@ -126,7 +126,7 @@ class ObjectSenderWithQAppCheckOnReceiverTest(UsesQCoreApplication): recv = Receiver() QObject.connect(sender, SIGNAL('timeout()'), recv.callback) sender.start(10) - self.app.exec_() + self.app.exec() self.assertEqual(sender, recv.the_sender) diff --git a/sources/pyside6/tests/signals/ref02_test.py b/sources/pyside6/tests/signals/ref02_test.py index d516a1e67..922a50e46 100644 --- a/sources/pyside6/tests/signals/ref02_test.py +++ b/sources/pyside6/tests/signals/ref02_test.py @@ -64,7 +64,7 @@ class NativeSignalsTest(UsesQCoreApplication): self.timeline.valueChanged.connect(valueChangedSlot) self.timeline.start() - self.app.exec_() + self.app.exec() self.assertTrue(self.called) def testSignalWithoutArguments(self): @@ -76,7 +76,7 @@ class NativeSignalsTest(UsesQCoreApplication): self.timeline.finished.connect(finishedSlot) self.timeline.start() - self.app.exec_() + self.app.exec() self.assertTrue(self.called) diff --git a/sources/pyside6/tests/signals/ref05_test.py b/sources/pyside6/tests/signals/ref05_test.py index 5d64684dd..38c06ce1c 100644 --- a/sources/pyside6/tests/signals/ref05_test.py +++ b/sources/pyside6/tests/signals/ref05_test.py @@ -73,7 +73,7 @@ class UserSlotTest(UsesQCoreApplication): self.timeline.valueChanged.connect(self.receiver.foo) self.timeline.start() - self.app.exec_() + self.app.exec() self.assertTrue(self.receiver.counter > 1) diff --git a/sources/pyside6/tests/signals/ref06_test.py b/sources/pyside6/tests/signals/ref06_test.py index f6c27c9f2..c0d8c2a91 100644 --- a/sources/pyside6/tests/signals/ref06_test.py +++ b/sources/pyside6/tests/signals/ref06_test.py @@ -76,7 +76,7 @@ class SignaltoSignalTest(UsesQCoreApplication): self.timeline.start() - self.app.exec_() + self.app.exec() self.assertTrue(self.receiver.counter > 1) diff --git a/sources/pyside6/tests/signals/signal_across_threads.py b/sources/pyside6/tests/signals/signal_across_threads.py index 3ab58cf53..2a3302655 100644 --- a/sources/pyside6/tests/signals/signal_across_threads.py +++ b/sources/pyside6/tests/signals/signal_across_threads.py @@ -97,7 +97,7 @@ class SignalAcrossThreads(UsesQCoreApplication): self._worker_thread.started.connect(main_thread_receiver.slot_function) self._timer.start() - self.app.exec_() + self.app.exec() self.assertEqual(worker_thread_receiver.senderThread, self._worker_thread) self.assertEqual(main_thread_receiver.senderThread, main_thread) diff --git a/sources/pyside6/tests/signals/signal_object_test.py b/sources/pyside6/tests/signals/signal_object_test.py index 4df20f5d0..b0f115e85 100644 --- a/sources/pyside6/tests/signals/signal_object_test.py +++ b/sources/pyside6/tests/signals/signal_object_test.py @@ -95,14 +95,14 @@ class SignalObjectTest(UsesQCoreApplication): o = MyObject() o.timeout.connect(self.cb) o.start(100) - self.app.exec_() + self.app.exec() self.assertTrue(self._cb_called) def testConnectionType(self): o = MyObject() o.timeout.connect(self.cb, type=Qt.DirectConnection) o.start(100) - self.app.exec_() + self.app.exec() self.assertTrue(self._cb_called) def testSignalWithSignal(self): diff --git a/sources/pyside6/tests/signals/signal_with_primitive_type_test.py b/sources/pyside6/tests/signals/signal_with_primitive_type_test.py index dbf059a1d..e5abdaae3 100644 --- a/sources/pyside6/tests/signals/signal_with_primitive_type_test.py +++ b/sources/pyside6/tests/signals/signal_with_primitive_type_test.py @@ -57,7 +57,7 @@ class SignalPrimitiveTypeTest(unittest.TestCase): self._app = QCoreApplication([]) tl = self.createTimeLine() tl.start() - self._app.exec_() + self._app.exec() self.assertTrue(self.called) -- cgit v1.2.3