aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2022-10-12 10:26:18 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-10-12 13:24:43 +0000
commit365b0ecc0402df88e2bf90a36eb4e4339e4c94d4 (patch)
treed240b3444e7f3d3873566d4cadce036fd7840ea1
parentf76661cc00423e357ae5bf43aa13f8513c038da4 (diff)
pypy: fix build for 3.9
Skip section for PyPy instead of only the version, and removing second argument from TypeKey_to_PropsDict call. Change-Id: Ic416a33d82865a1e64c5e632485cb12ec0de3533 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a859a5d5c43d1d72e2b62a503292cf31ade7a738) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/shiboken6/libshiboken/sbkfeature_base.cpp2
-rw-r--r--sources/shiboken6/libshiboken/signature/signature.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken6/libshiboken/sbkfeature_base.cpp b/sources/shiboken6/libshiboken/sbkfeature_base.cpp
index 44dea8b53..1d1399ae7 100644
--- a/sources/shiboken6/libshiboken/sbkfeature_base.cpp
+++ b/sources/shiboken6/libshiboken/sbkfeature_base.cpp
@@ -128,7 +128,7 @@ static bool currentOpcode_Is_CallMethNoArgs()
// We look into the currently active operation if we are going to call
// a method with zero arguments.
auto *frame = PyEval_GetFrame();
-#if PY_VERSION_HEX >= 0x03090000 && !Py_LIMITED_API
+#if PY_VERSION_HEX >= 0x03090000 && !Py_LIMITED_API && !defined(PYPY_VERSION)
auto *f_code = PyFrame_GetCode(frame);
#else
static PyObject *const _f_code = Shiboken::String::createStaticString("f_code");
diff --git a/sources/shiboken6/libshiboken/signature/signature.cpp b/sources/shiboken6/libshiboken/signature/signature.cpp
index 19d2b13d4..f34cac824 100644
--- a/sources/shiboken6/libshiboken/signature/signature.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature.cpp
@@ -140,7 +140,7 @@ PyObject *GetSignature_Method(PyObject *obfunc, PyObject *modifier)
AutoDecRef type_key(GetTypeKey(obtype_mod));
if (type_key.isNull())
Py_RETURN_NONE;
- PyObject *dict = TypeKey_to_PropsDict(type_key, obtype_mod);
+ PyObject *dict = TypeKey_to_PropsDict(type_key);
if (dict == nullptr)
return nullptr;
AutoDecRef func_name(PyObject_GetAttr(obfunc, PyMagicName::name()));