From e24392c76e5cfdd2d6d51bd853b106db2bc4cb80 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Thu, 19 Jul 2018 21:00:30 +0200 Subject: Pep 384 Final Cut: Remove PepType While trying to document the Limited API Project, it suddenly struck me: We can make the patch much much simpler and implement it without the necessity to have an extra PepType! Now I am happy to continue the documentation, because it is now no more improvable. This version will last as long as the layout of PyTypeObject does not change substantially. When that happens, then we need to rewrite stuff with the according PyType_GetSlot() access functions. These access functions will until then be complete enough so that we can live without the tricks like inventing a reduced PyTypeObject as was done in the current implementation. Task-number: PYSIDE-560 Change-Id: I49849cc377baa6794a5b53292691e21d6e2853ab Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint Reviewed-by: Alexandru Croitor --- sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp | 2 +- sources/pyside2/PySide2/QtCore/glue/qbytearray_msetitem.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sources/pyside2/PySide2/QtCore/glue') diff --git a/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp b/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp index f1d5a6bfc..9612f41b0 100644 --- a/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp +++ b/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp @@ -82,6 +82,6 @@ if (PyIndex_Check(_key)) { } else { PyErr_Format(PyExc_TypeError, "list indices must be integers or slices, not %.200s", - PepType((Py_TYPE(_key)))->tp_name); + Py_TYPE(_key)->tp_name); return NULL; } diff --git a/sources/pyside2/PySide2/QtCore/glue/qbytearray_msetitem.cpp b/sources/pyside2/PySide2/QtCore/glue/qbytearray_msetitem.cpp index 6745fc964..1349f40f1 100644 --- a/sources/pyside2/PySide2/QtCore/glue/qbytearray_msetitem.cpp +++ b/sources/pyside2/PySide2/QtCore/glue/qbytearray_msetitem.cpp @@ -67,7 +67,7 @@ if (PyIndex_Check(_key)) { PyErr_SetString(PyExc_ValueError, "bytearray must be of size 1"); return -1; } - } else if (PepType(Py_TYPE(_value)) == PepType(SbkPySide2_QtCoreTypes[SBK_QBYTEARRAY_IDX])) { + } else if (reinterpret_cast(Py_TYPE(_value)) == reinterpret_cast(SbkPySide2_QtCoreTypes[SBK_QBYTEARRAY_IDX])) { if (PyObject_Length(_value) != 1) { PyErr_SetString(PyExc_ValueError, "QByteArray must be of size 1"); return -1; @@ -109,15 +109,15 @@ if (PyIndex_Check(_key)) { if (_value == NULL || _value == Py_None) { ba = QByteArray(); value_length = 0; - } else if (!(PyBytes_Check(_value) || PyByteArray_Check(_value) || PepType(Py_TYPE(_value)) == PepType(SbkPySide2_QtCoreTypes[SBK_QBYTEARRAY_IDX]))) { - PyErr_Format(PyExc_TypeError, "bytes, bytearray or QByteArray is required, not %.200s", PepType(Py_TYPE(_value))->tp_name); + } else if (!(PyBytes_Check(_value) || PyByteArray_Check(_value) || reinterpret_cast(Py_TYPE(_value)) == reinterpret_cast(SbkPySide2_QtCoreTypes[SBK_QBYTEARRAY_IDX]))) { + PyErr_Format(PyExc_TypeError, "bytes, bytearray or QByteArray is required, not %.200s", Py_TYPE(_value)->tp_name); return -1; } else { value_length = PyObject_Length(_value); } if (step != 1 && value_length != slicelength) { - PyErr_Format(PyExc_ValueError, "attempt to assign %s of size %d to extended slice of size %d",PepType(Py_TYPE(_value))->tp_name, value_length, slicelength); + PyErr_Format(PyExc_ValueError, "attempt to assign %s of size %d to extended slice of size %d",Py_TYPE(_value)->tp_name, value_length, slicelength); return -1; } @@ -151,7 +151,7 @@ if (PyIndex_Check(_key)) { } } else { PyErr_Format(PyExc_TypeError, "QBytearray indices must be integers or slices, not %.200s", - PepType(Py_TYPE(_key))->tp_name); + Py_TYPE(_key)->tp_name); return -1; } -- cgit v1.2.3