Restore compatibility with Python 3.12

python/cpython@7644935

Author: jhasse

.github/workflows/python-package.yml

@@ -20,7 +20,7 @@ jobs:
         # would use windows-latest, but distutils tries to build against the version of MSVC that python was compiled with
         #   https://github.com/pypa/setuptools/blob/main/setuptools/_distutils/msvc9compiler.py#L403
         os: [ "ubuntu-latest", "macos-12", "windows-2019" ]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         #os: [ "ubuntu-latest" ]
         #python-version: ["3.8"]
 

setup.py

@@ -24,10 +24,10 @@
 
         if '32 bit' in sys.version:
             extra_objects = ['src/switch_x86_msvc.obj']
-            os.system('ml /nologo /c /Fo src\switch_x86_msvc.obj src\switch_x86_msvc.asm')
+            os.system('ml /nologo /c /Fo src\\switch_x86_msvc.obj src\\switch_x86_msvc.asm')
         else:
             extra_objects = ['src/switch_x64_msvc.obj']
-            os.system('ml64 /nologo /c /Fo src\switch_x64_msvc.obj src\switch_x64_msvc.asm')
+            os.system('ml64 /nologo /c /Fo src\\switch_x64_msvc.obj src\\switch_x64_msvc.asm')
 
     ext_modules  = [Extension('fibers._cfibers',
                               sources=glob.glob('src/*.c'),

src/fibers.c

@@ -241,7 +241,12 @@ stacklet__callback(stacklet_handle h, void *arg)
     self->ts.exc_state.exc_type = NULL;
     self->ts.exc_state.exc_traceback = NULL;
 #else
+#if PY_MINOR_VERSION < 12
     self->ts.recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
+#else
+    self->ts.recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
+    self->ts.c_recursion_remaining = tstate->c_recursion_remaining;
+#endif
     self->ts.cframe = NULL;
     self->ts.datastack_chunk = NULL;
     self->ts.datastack_top = NULL;
@@ -307,7 +312,12 @@ do_switch(Fiber *self, PyObject *value)
     current->ts.exc_state.exc_type = tstate->exc_state.exc_type;
     current->ts.exc_state.exc_traceback = tstate->exc_state.exc_traceback;
 #else
+#if PY_MINOR_VERSION < 12
     current->ts.recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
+#else
+    current->ts.recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
+    current->ts.c_recursion_remaining = tstate->c_recursion_remaining;
+#endif
     current->ts.frame = PyThreadState_GetFrame(tstate);
     Py_XDECREF(current->ts.frame);
     current->ts.cframe = tstate->cframe;
@@ -360,7 +370,12 @@ do_switch(Fiber *self, PyObject *value)
     tstate->exc_state.exc_type = current->ts.exc_state.exc_type;
     tstate->exc_state.exc_traceback = current->ts.exc_state.exc_traceback;
 #else
+#if PY_MINOR_VERSION < 12
     tstate->recursion_remaining = tstate->recursion_limit - current->ts.recursion_depth;
+#else
+    tstate->py_recursion_remaining = tstate->py_recursion_limit - current->ts.recursion_depth;
+    tstate->c_recursion_remaining = current->ts.c_recursion_remaining;
+#endif
     tstate->cframe = current->ts.cframe;
     tstate->datastack_chunk = current->ts.datastack_chunk;
     tstate->datastack_top = current->ts.datastack_top;

src/fibers.h

@@ -38,6 +38,9 @@ typedef struct _fiber {
 #endif
         struct _frame *frame;
         int recursion_depth;
+#if PY_MINOR_VERSION >= 12
+        int c_recursion_remaining;
+#endif
         _PyErr_StackItem exc_state;
     } ts;
 } Fiber;