From f16328b8705f39a10216356d3c14f28607f62a72 Mon Sep 17 00:00:00 2001 From: Boxiang Sun Date: Wed, 4 Jul 2018 06:49:04 +0800 Subject: Remove Py_TPFLAGS_HAVE_VERSION_TAG in Python 3 The Py_TPFLAGS_DEFAULT in Python 3 has the Py_TPFLAGS_HAVE_VERSION_TAG flag, which causes the type attribute cache in _PyType_Lookup. According to the Shiboken implementation for Python 2, this is not we expected. So remove the Py_TPFLAGS_HAVE_VERSION_TAG flag from Py_TPFLAGS_DEFAULT in Python 3. Task-number: PYSIDE-60 Change-Id: Id731a59b65640eb5adea56fe06e0deb58ac4a168 Reviewed-by: Christian Tismer --- sources/pyside2/tests/QtCore/CMakeLists.txt | 1 + sources/pyside2/tests/QtCore/attr_cache_py3k.py | 65 +++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 sources/pyside2/tests/QtCore/attr_cache_py3k.py (limited to 'sources/pyside2/tests/QtCore') diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt index aba691838..649e796cc 100644 --- a/sources/pyside2/tests/QtCore/CMakeLists.txt +++ b/sources/pyside2/tests/QtCore/CMakeLists.txt @@ -1,3 +1,4 @@ +PYSIDE_TEST(attr_cache_py3k.py) PYSIDE_TEST(bug_278_test.py) PYSIDE_TEST(bug_332.py) PYSIDE_TEST(bug_408.py) diff --git a/sources/pyside2/tests/QtCore/attr_cache_py3k.py b/sources/pyside2/tests/QtCore/attr_cache_py3k.py new file mode 100644 index 000000000..ec0575b02 --- /dev/null +++ b/sources/pyside2/tests/QtCore/attr_cache_py3k.py @@ -0,0 +1,65 @@ +# This Python file uses the following encoding: utf-8 + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of Qt for Python. +## +## $QT_BEGIN_LICENSE:LGPL$ +## 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 Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## 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-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +''' +Unit tests for attribute cache in Python 3 + +This is the original code from the bug report +https://bugreports.qt.io/browse/PYSIDE-60 +''' + +from PySide2.QtCore import QObject + + +class A(QObject): + instance = 1 + + @classmethod + def test(cls): + cls.instance + cls.instance = cls() + assert "<__main__.A object " in repr(cls.__dict__['instance']) + assert "<__main__.A object " in repr(cls.instance) + assert "<__main__.A object " in repr(type.__getattribute__(cls, 'instance')) + + +if __name__ == "__main__": + A.test() -- cgit v1.2.3