blackbeard420/kore
1
0
Fork 0
mirror of https://github.com/jorisvink/kore synced 2025-03-09 04:29:02 -04:00
Code Issues Projects Releases Wiki Activity

Support Python 3.13.

Browse Source 
Since we're using some cpython internals that change from time to time
we have to adjust for the 3.13 release accordingly.
This commit is contained in:
Joris Vink 2024-11-08 20:08:19 +01:00
parent c437e15b5c
commit 4bd456a334
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/python.c
View File

@ -55,10 +55,33 @@
#include <frameobject.h> #include <frameobject.h>
/*
* Python 3.13.x requires that Py_BUILD_CORE is defined before we pull
* in the pycore_frame header file, and it loves using unnamed unions
* so we have to turn off pendatic mode before including it.
*
* The f_code member was removed from _PyInterpreterFrame and is replaced
* with a PyObject called f_executable. There is an _PyFrame_GetCode()
* helper function now.
*/
#if PY_VERSION_HEX >= 0x030d0000
#define Py_BUILD_CORE 1
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#endif
#if PY_VERSION_HEX < 0x030d0000
#define _PyFrame_GetCode(frame) (frame->f_code)
#endif
#if PY_VERSION_HEX >= 0x030b0000 #if PY_VERSION_HEX >= 0x030b0000
#include <internal/pycore_frame.h> #include <internal/pycore_frame.h>
#endif #endif
#if PY_VERSION_HEX >= 0x030d0000
#pragma GCC diagnostic pop
#endif
#if PY_VERSION_HEX < 0x030A0000 #if PY_VERSION_HEX < 0x030A0000
typedef enum { typedef enum {
PYGEN_RETURN = 0, PYGEN_RETURN = 0,
@ -1201,7 +1224,7 @@ python_resolve_frame_line(void *ptr)
frame = ptr; frame = ptr;
addr = _PyInterpreterFrame_LASTI(frame) * sizeof(_Py_CODEUNIT); addr = _PyInterpreterFrame_LASTI(frame) * sizeof(_Py_CODEUNIT);
line = PyCode_Addr2Line(frame->f_code, addr); line = PyCode_Addr2Line(_PyFrame_GetCode(frame), addr);
#else #else
line = PyFrame_GetLineNumber(ptr); line = PyFrame_GetLineNumber(ptr);
#endif #endif
@ -1232,8 +1255,8 @@ python_coro_trace(const char *label, struct python_coro *coro)
#else #else
frame = obj->cr_frame; frame = obj->cr_frame;
#endif #endif
if (frame != NULL && frame->f_code != NULL) { if (frame != NULL && _PyFrame_GetCode(frame) != NULL) {
code = frame->f_code; code = _PyFrame_GetCode(frame);
func = PyUnicode_AsUTF8AndSize(code->co_name, NULL); func = PyUnicode_AsUTF8AndSize(code->co_name, NULL);
file = PyUnicode_AsUTF8AndSize(code->co_filename, NULL); file = PyUnicode_AsUTF8AndSize(code->co_filename, NULL);