diff options
Diffstat (limited to 'sources/pyside6/tests/QtQml/bug_825.py')
| -rw-r--r-- | sources/pyside6/tests/QtQml/bug_825.py | 65 |
1 files changed, 28 insertions, 37 deletions
diff --git a/sources/pyside6/tests/QtQml/bug_825.py b/sources/pyside6/tests/QtQml/bug_825.py index f3315c6ed..a8bd304ec 100644 --- a/sources/pyside6/tests/QtQml/bug_825.py +++ b/sources/pyside6/tests/QtQml/bug_825.py @@ -1,30 +1,10 @@ -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the test suite of Qt for Python. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +""" +This is the corrected version for Python 3. +Unfortunately, this touches a Python 3.8 error that was fixed late. +""" import os import sys @@ -35,7 +15,7 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1])) from init_paths import init_test_paths init_test_paths(False) -from helper.helper import adjust_filename +from helper.helper import quickview_errorstring from PySide6.QtCore import Qt, QUrl, QTimer from PySide6.QtGui import QGuiApplication, QPen @@ -45,32 +25,39 @@ from PySide6.QtQuick import QQuickView, QQuickItem, QQuickPaintedItem paintCalled = False + class MetaA(type): pass -class A(object): - __metaclass__ = MetaA + +class A(object, metaclass=MetaA): + pass + MetaB = type(QQuickPaintedItem) B = QQuickPaintedItem + class MetaC(MetaA, MetaB): pass -class C(A, B): - __metaclass__ = MetaC + +class C(A, B, metaclass=MetaC): + pass + class Bug825 (C): - def __init__(self, parent = None): + def __init__(self, parent=None): QQuickPaintedItem.__init__(self, parent) def paint(self, painter): global paintCalled pen = QPen(Qt.black, 2) - painter.setPen(pen); - painter.drawPie(self.boundingRect(), 0, 128); + painter.setPen(pen) + painter.drawPie(self.boundingRect(), 0, 128) paintCalled = True + class TestBug825 (unittest.TestCase): def testIt(self): global paintCalled @@ -79,11 +66,15 @@ class TestBug825 (unittest.TestCase): self.assertRaises(TypeError, qmlRegisterType, A, 'bugs', 1, 0, 'A') view = QQuickView() - view.setSource(QUrl.fromLocalFile(adjust_filename('bug_825.qml', __file__))) + file = Path(__file__).resolve().parent / 'bug_825.qml' + self.assertTrue(file.is_file()) + view.setSource(QUrl.fromLocalFile(file)) + self.assertTrue(view.rootObject(), quickview_errorstring(view)) view.show() QTimer.singleShot(250, view.close) - app.exec_() + app.exec() self.assertTrue(paintCalled) + if __name__ == '__main__': unittest.main() |