From af98eac426c0cee4003ac45bf0fcfcabccf0e9f2 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Tue, 5 Sep 2023 18:41:42 +0200 Subject: PyPySide: Fix a small, very old glitch Many years ago (2012), the format string of SbkObjectType_tp_new contained the string "SO!O!:sbktype". The meaning of this "S" is redundant for historical reasons and means PyObject. It is equal to "O". At some unknown point in time, this "S" was erroneously turned into "s", which means a plain string. Unfortunately, this neat finding does not solve the multiple inheritance problem of PyPy, but this will surely be found at some point, too. Change-Id: I51045216f9c0aa2c9efdda06a2ad5f9ac64e9696 Task-number: PYSIDE-535 Pick-to: 6.5 Reviewed-by: Friedemann Kleint --- sources/shiboken6/libshiboken/basewrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/shiboken6/libshiboken/basewrapper.cpp') diff --git a/sources/shiboken6/libshiboken/basewrapper.cpp b/sources/shiboken6/libshiboken/basewrapper.cpp index 9e5d1b89e..a0e4e5311 100644 --- a/sources/shiboken6/libshiboken/basewrapper.cpp +++ b/sources/shiboken6/libshiboken/basewrapper.cpp @@ -476,7 +476,7 @@ static PyTypeObject *SbkObjectType_tp_new(PyTypeObject *metatype, PyObject *args PyObject *dict; static const char *kwlist[] = { "name", "bases", "dict", nullptr}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "sO!O!:sbktype", const_cast(kwlist), + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!O!:sbktype", const_cast(kwlist), &name, &PyTuple_Type, &pyBases, &PyDict_Type, &dict)) -- cgit v1.2.3