Python 3.11 build fixes

zeroc-ice · Oct 30, 2022 · 4d1158b · 4d1158b
1 parent 21e2dde
commit 4d1158b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/python/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp
@@ -14,7 +14,12 @@
 // Python headers needed for PyEval_EvalCode.
 //
 #include <compile.h>
-#include <eval.h>
+// Use ceval.h instead of eval.h with Pyhthon 3.11 and greater
+#if PY_VERSION_HEX > 0x030B0000
+#   include <ceval.h>
+#else
+#   include <eval.h>
+#endif
 
 using namespace std;
 using namespace IcePy;

diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
@@ -225,7 +225,12 @@ IcePy::getFunction()
     //
     // Get name of current function.
     //
+    // Use PyEval_GetFrame with Pyhthon >= 3.11
+#if PY_VERSION_HEX > 0x030B0000
+    PyFrameObject *f = PyEval_GetFrame();
+#else
     PyFrameObject *f = PyThreadState_GET()->frame;
+#endif
     PyObjectHandle code = getAttr(reinterpret_cast<PyObject*>(f), "f_code", false);
     assert(code.get());
     PyObjectHandle func = getAttr(code.get(), "co_name", false);