From 9cbb340cefc781eff96456a85b90774033e39241 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Tue, 25 Jan 2022 13:23:59 +0100 Subject: PyPySide: fix a few more cases of QPainter without end() This will be replaced by a context manager, soon. Also, begin and end should not simply return a boolean but raise an exception when something serious broke. Task-number: PYSIDE-535 Change-Id: Ieb2f845a01105381aab539e04b964de7a551d739 Reviewed-by: Friedemann Kleint (cherry picked from commit d90d6c260bdf97c6b10e0ff58fbd422a197f9917) Reviewed-by: Qt Cherry-pick Bot --- sources/pyside6/tests/QtGui/qrasterwindow_test.py | 3 ++- sources/pyside6/tests/QtWidgets/qpen_test.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sources/pyside6/tests/QtGui/qrasterwindow_test.py b/sources/pyside6/tests/QtGui/qrasterwindow_test.py index a2d8ecc3e..8224f1e35 100644 --- a/sources/pyside6/tests/QtGui/qrasterwindow_test.py +++ b/sources/pyside6/tests/QtGui/qrasterwindow_test.py @@ -53,7 +53,8 @@ class TestRasterWindow(QRasterWindow): painter = QPainter(self) painter.fillRect(clientRect, QColor(Qt.red)) painter.drawStaticText(QPoint(10, 10), self.text) - + # PYSIDE-535: PyPy needs an explicit end() or a context manager. + painter.end() class QRasterWindowTest(UsesQGuiApplication): def test(self): diff --git a/sources/pyside6/tests/QtWidgets/qpen_test.py b/sources/pyside6/tests/QtWidgets/qpen_test.py index f1fe0fc5f..7ca73cca8 100644 --- a/sources/pyside6/tests/QtWidgets/qpen_test.py +++ b/sources/pyside6/tests/QtWidgets/qpen_test.py @@ -54,6 +54,8 @@ class Painting(QWidget): self.penFromEnum = painter.pen() painter.setPen(int(Qt.NoPen)) self.penFromInteger = painter.pen() + # PYSIDE-535: PyPy needs an explicit end() or a context manager. + painter.end() QTimer.singleShot(20, self.close) -- cgit v1.2.3