diff options
| -rw-r--r-- | sources/pyside2/tests/QtWidgets/qwidget_test.py | 7 | ||||
| -rw-r--r-- | sources/shiboken2/libshiboken/basewrapper.cpp | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/sources/pyside2/tests/QtWidgets/qwidget_test.py b/sources/pyside2/tests/QtWidgets/qwidget_test.py index 028751ba7..d0a4a8dfa 100644 --- a/sources/pyside2/tests/QtWidgets/qwidget_test.py +++ b/sources/pyside2/tests/QtWidgets/qwidget_test.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the test suite of Qt for Python. @@ -52,6 +52,11 @@ class QWidgetTest(UsesQApplication): def testInheritance(self): self.assertRaises(TypeError, QWidgetInherit) + if sys.version_info[0] < 3: + def testCallType_Issue_816(self): + thing = type(QWidget).__new__(type(QWidget), "", (), {}) + self.assertEqual(repr(thing), "<class '__main__.'>") + class QWidgetVisible(UsesQApplication): def testBasic(self): diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp index 8fe4710dd..a008fece8 100644 --- a/sources/shiboken2/libshiboken/basewrapper.cpp +++ b/sources/shiboken2/libshiboken/basewrapper.cpp @@ -101,6 +101,15 @@ PyTypeObject *SbkObjectType_TypeF(void) SbkObjectType_Type_spec.basicsize = PepHeapType_SIZE + sizeof(SbkObjectTypePrivate); type = reinterpret_cast<PyTypeObject *>(PyType_FromSpec(&SbkObjectType_Type_spec)); +#if PY_VERSION_HEX < 0x03000000 + // PYSIDE-816: Python 2.7 has a bad check for Py_TPFLAGS_HEAPTYPE in + // typeobject.c func tp_new_wrapper. In Python 3 it was updated after + // the transition to the new type API, but not in 2.7 . Fortunately, + // the types did not change much when transitioning to heaptypes. We + // pretend that this type is a normal type in 2.7 and hope that this + // has no bad effect. + type->tp_flags &= ~Py_TPFLAGS_HEAPTYPE; +#endif } return type; } @@ -290,6 +299,10 @@ void SbkObjectTypeDealloc(PyObject* pyObj) SbkObjectTypePrivate *sotp = PepType_SOTP(pyObj); PyTypeObject *type = reinterpret_cast<PyTypeObject*>(pyObj); +#if PY_VERSION_HEX < 0x03000000 + // PYSIDE-816: Restore the heap type flag. Better safe than sorry. + type->tp_flags |= Py_TPFLAGS_HEAPTYPE; +#endif PyObject_GC_UnTrack(pyObj); #ifndef Py_LIMITED_API Py_TRASHCAN_SAFE_BEGIN(pyObj); |