PEP 384-squash: Implement PEP 384

This is the condensed checkin of 18 commits which created
the implementation of PEP 384.

Task-number: PYSIDE-560
Change-Id: I834c659af4c2b55b268f8e8dc4cfa53f02502409
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 35 insertions, 57 deletions

diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
index de85686ce..ccec8a2cb 100644
--- a/sources/pyside2/libpyside/pysideproperty.cpp
+++ b/sources/pyside2/libpyside/pysideproperty.cpp
@@ -72,55 +72,33 @@ static PyMethodDef PySidePropertyMethods[] = {
     {0, 0, 0, 0}
 };
 
-PyTypeObject PySidePropertyType = {
-    PyVarObject_HEAD_INIT(0, 0)
-    QPROPERTY_CLASS_NAME,      /*tp_name*/
-    sizeof(PySideProperty),   /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    qpropertyDeAlloc,          /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    0,                         /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    qPropertyCall,             /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,        /*tp_flags*/
-    0,                         /*tp_doc */
-    qpropertyTraverse,         /*tp_traverse */
-    qpropertyClear,            /*tp_clear */
-    0,                         /*tp_richcompare */
-    0,                         /*tp_weaklistoffset */
-    0,                         /*tp_iter */
-    0,                         /*tp_iternext */
-    PySidePropertyMethods,     /*tp_methods */
-    0,                         /*tp_members */
-    0,                         /*tp_getset */
-    0,                         /*tp_base */
-    0,                         /*tp_dict */
-    0,                         /*tp_descr_get */
-    0,                         /*tp_descr_set */
-    0,                         /*tp_dictoffset */
-    qpropertyTpInit,           /*tp_init */
-    0,                         /*tp_alloc */
-    qpropertyTpNew,            /*tp_new */
-    0,                         /*tp_free */
-    0,                         /*tp_is_gc */
-    0,                         /*tp_bases */
-    0,                         /*tp_mro */
-    0,                         /*tp_cache */
-    0,                         /*tp_subclasses */
-    0,                         /*tp_weaklist */
-    0,                         /*tp_del */
-    0                          /*tp_version_tag */
+static PyType_Slot PySidePropertyType_slots[] = {
+    {Py_tp_dealloc, (void *)qpropertyDeAlloc},
+    {Py_tp_call, (void *)qPropertyCall},
+    {Py_tp_traverse, (void *)qpropertyTraverse},
+    {Py_tp_clear, (void *)qpropertyClear},
+    {Py_tp_methods, (void *)PySidePropertyMethods},
+    {Py_tp_init, (void *)qpropertyTpInit},
+    {Py_tp_new, (void *)qpropertyTpNew},
+    {0, 0}
 };
+// Dotted modulename is crucial for PyType_FromSpec to work. Is this name right?
+static PyType_Spec PySidePropertyType_spec = {
+    "PySide2.QtCore." QPROPERTY_CLASS_NAME,
+    sizeof(PySideProperty),
+    0,
+    Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC|Py_TPFLAGS_BASETYPE,
+    PySidePropertyType_slots,
+};
+
+
+PyTypeObject *PySidePropertyTypeF(void)
+{
+    static PyTypeObject *type = nullptr;
+    if (!type)
+        type = (PyTypeObject *)PyType_FromSpec(&PySidePropertyType_spec);
+    return type;
+}
 
 static void qpropertyMetaCall(PySideProperty* pp, PyObject* self, QMetaObject::Call call, void** args)
 {
@@ -174,7 +152,7 @@ static void qpropertyMetaCall(PySideProperty* pp, PyObject* self, QMetaObject::C
 
 static PyObject *qpropertyTpNew(PyTypeObject *subtype, PyObject * /* args */, PyObject * /* kwds */)
 {
-    PySideProperty* me = reinterpret_cast<PySideProperty*>(subtype->tp_alloc(subtype, 0));
+    PySideProperty* me = reinterpret_cast<PySideProperty*>(PepType(subtype)->tp_alloc(subtype, 0));
     me->d = new PySidePropertyPrivate;
     memset(me->d, 0, sizeof(PySidePropertyPrivate));
     PySidePropertyPrivate* pData = me->d;
@@ -232,7 +210,7 @@ int qpropertyTpInit(PyObject* self, PyObject* args, PyObject* kwds)
 void qpropertyDeAlloc(PyObject* self)
 {
     qpropertyClear(self);
-    Py_TYPE(self)->tp_free(self);
+    PepType(Py_TYPE(self))->tp_free(self);
 }
 
 PyObject *qPropertyCall(PyObject *self, PyObject *args, PyObject * /* kw */)
@@ -329,9 +307,9 @@ namespace {
 static PyObject* getFromType(PyTypeObject* type, PyObject* name)
 {
     PyObject* attr = 0;
-    attr = PyDict_GetItem(type->tp_dict, name);
+    attr = PyDict_GetItem(PepType(type)->tp_dict, name);
     if (!attr) {
-        PyObject* bases = type->tp_bases;
+        PyObject* bases = PepType(type)->tp_bases;
         int size = PyTuple_GET_SIZE(bases);
         for(int i=0; i < size; i++) {
             PyObject* base = PyTuple_GET_ITEM(bases, i);
@@ -350,17 +328,17 @@ namespace PySide { namespace Property {
 
 void init(PyObject* module)
 {
-    if (PyType_Ready(&PySidePropertyType) < 0)
+    if (PyType_Ready(PySidePropertyTypeF()) < 0)
         return;
 
-    Py_INCREF(&PySidePropertyType);
-    PyModule_AddObject(module, QPROPERTY_CLASS_NAME, reinterpret_cast<PyObject *>(&PySidePropertyType));
+    Py_INCREF(PySidePropertyTypeF());
+    PyModule_AddObject(module, QPROPERTY_CLASS_NAME, reinterpret_cast<PyObject *>(PySidePropertyTypeF()));
 }
 
 bool checkType(PyObject* pyObj)
 {
     if (pyObj) {
-        return PyType_IsSubtype(pyObj->ob_type, &PySidePropertyType);
+        return PyType_IsSubtype(Py_TYPE(pyObj), PySidePropertyTypeF());
     }
     return false;
 }
@@ -427,7 +405,7 @@ PySideProperty* getObject(PyObject* source, PyObject* name)
             attr = PyDict_GetItem(dict, name);
     }
 
-    attr = getFromType(source->ob_type, name);
+    attr = getFromType(Py_TYPE(source), name);
     if (attr && checkType(attr)) {
         Py_INCREF(attr);
         return reinterpret_cast<PySideProperty*>(attr);