lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-13 19:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use pythoncapi-compat to simplify Python C API backwards compatibility

Browse Source
This commit is contained in:
kb1000
2024-02-18 14:08:04 +01:00
committed by Baldur Karlsson
parent d0a24b31cd
commit bb7ec408cb
12 changed files with 1163 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+6 -43
View File
@@ -29,7 +29,8 @@
// must be included first
#include <Python.h>
#include <frameobject.h>
#include "3rdparty/pythoncapi_compat.h"
#ifdef slots_was_defined
#define slots
@@ -72,43 +73,6 @@ PyTypeObject **SbkPySide2_QtWidgetsTypes = NULL;
#include "PythonContext.h"
#include "version.h"
// helpers for new PyFrameObject accessors in newer python versions, that are required starting from
// python 3.11
#if PY_VERSION_HEX < 0x030B0000
// Get the frame's f_globals attribute.
// Return a strong reference
PyObject *PyFrame_GetGlobals(PyFrameObject *frame)
{
PyObject *ret = frame->f_globals;
Py_XINCREF(ret);
return ret;
}
#endif
#if PY_VERSION_HEX < 0x03090000
// Get the frame next outer frame.
// Return a strong reference
PyFrameObject *PyFrame_GetBack(PyFrameObject *frame)
{
PyFrameObject *ret = frame->f_back;
Py_XINCREF(ret);
return ret;
}
// Get the frame code.
// Return a strong reference
PyCodeObject *PyFrame_GetCode(PyFrameObject *frame)
{
PyCodeObject *ret = frame->f_code;
Py_XINCREF(ret);
return ret;
}
#endif
// exported by generated files, used to check interface compliance
bool CheckCoreInterface(rdcstr &log);
bool CheckQtInterface(rdcstr &log);
@@ -883,8 +847,7 @@ void PythonContext::ConvertPyArgs(const ExtensionCallbackData &data,
if(!out)
{
qCritical() << "Couldn't convert" << in << "to python object";
out = Py_None;
Py_XINCREF(out);
out = Py_XNewRef(Py_None);
}
}
@@ -1063,7 +1026,7 @@ QWidget *PythonContext::QWidgetFromPy(PyObject *widget)
if(!initialised())
return NULL;
if(widget == Py_None || widget == NULL)
if(Py_IsNone(widget) || widget == NULL)
return NULL;
if(!SbkPySide2_QtCoreTypes || !SbkPySide2_QtGuiTypes || !SbkPySide2_QtWidgetsTypes)
@@ -1098,7 +1061,7 @@ QStringList PythonContext::completionOptions(QString base)
{
opt = PyObject_CallFunction(completeFunction, "si", input, idx);
if(opt && opt != Py_None)
if(opt && !Py_IsNone(opt))
{
QString optstr = ToQStr(opt);
@@ -1114,7 +1077,7 @@ QStringList PythonContext::completionOptions(QString base)
}
idx++;
} while(opt && opt != Py_None);
} while(opt && !Py_IsNone(opt));
// extra hack, remove the swig object functions/data but ONLY if we find a sure-fire identifier
// (thisown) since otherwise we could remove append from a list object