diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2022-01-10 10:22:09 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2022-01-18 13:07:01 +0100 |
| commit | 56f66f128566bd08f027fee46bb42a6c4f57a26e (patch) | |
| tree | d6a0f87ea3251af90fe965bd79ee877918ce8cd5 /sources/pyside6/libpyside/pysidesignal.cpp | |
| parent | 32b811150e273dc0b92179ae0fcd4a82330d3b21 (diff) | |
Safe distinction of Nuitka compiled methods
Adds an extra check to see if __code__ is present.
As mentioned in PYSIDE-1755, Mocks are callable objects without __code__
attribute, unlike Python Method or Functions. However, a Mock also has
im_func__ and im__self attributes. We made the assumption __code__
would be present if im_func and im_self are present, and this makes it
fall under the category of a compiled method.
This patch makes an extra check to see if __code__ is present. If it is
not, then the Slot (here Mock) is considered as a callable method.
Task-number: PYSIDE-1755
Pick-to: 6.2
Change-Id: If7e8f52dfb2409cd856eec0d0b41891d751d8a69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pysidesignal.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pysidesignal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp index 9e9105712..dfe96427d 100644 --- a/sources/pyside6/libpyside/pysidesignal.cpp +++ b/sources/pyside6/libpyside/pysidesignal.cpp @@ -330,7 +330,7 @@ static void extractFunctionArgumentsFromSlot(PyObject *slot, if (functionName != nullptr) { *functionName = Shiboken::String::toCString(PepFunction_GetName(function)); } - } else if (PyObject_HasAttr(slot, PySide::PyName::im_func())) { + } else if (PySide::isCompiledMethod(slot)) { // PYSIDE-1523: PyFunction_Check and PyMethod_Check are not accepting compiled forms, we // just go by attributes. isMethod = true; @@ -381,6 +381,7 @@ static void extractFunctionArgumentsFromSlot(PyObject *slot, function = nullptr; } } + // any other callback } static PyObject *signalInstanceConnect(PyObject *self, PyObject *args, PyObject *kwds) @@ -1172,8 +1173,7 @@ QString codeCallbackName(PyObject *callback, const QString &funcName) return funcName + QString::number(quint64(self), 16) + QString::number(quint64(func), 16); } // PYSIDE-1523: Handle the compiled case. - if (PyObject_HasAttr(callback, PySide::PyName::im_func()) - && PyObject_HasAttr(callback, PySide::PyName::im_self())) { + if (PySide::isCompiledMethod(callback)) { // Not retaining references inline with what PyMethod_GET_(SELF|FUNC) does. Shiboken::AutoDecRef self(PyObject_GetAttr(callback, PySide::PyName::im_self())); Shiboken::AutoDecRef func(PyObject_GetAttr(callback, PySide::PyName::im_func())); |