diff options
| author | Christian Tismer <tismer@stackless.com> | 2023-09-05 18:41:42 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-06 09:19:30 +0000 |
| commit | 34b6a09a7a5270f5c0805723174615a018ac775a (patch) | |
| tree | 4ff3f9c604c8b76adc4b63b4afde555617c198f3 | |
| parent | f91bcb6143af67f5edb0a570cc3b47cfdb3c6b93 (diff) | |
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
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit af98eac426c0cee4003ac45bf0fcfcabccf0e9f2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/shiboken6/libshiboken/basewrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken6/libshiboken/basewrapper.cpp b/sources/shiboken6/libshiboken/basewrapper.cpp index b01d01685..8a7069fca 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<char **>(kwlist), + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!O!:sbktype", const_cast<char **>(kwlist), &name, &PyTuple_Type, &pyBases, &PyDict_Type, &dict)) |