Fix compatibility with Python 3.11

BoPeng · May 23, 2023 · 5bd4bc9 · 5bd4bc9
1 parent 1ee8596
commit 5bd4bc9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/src/customizedTemplates.cpp b/src/customizedTemplates.cpp
@@ -685,11 +685,19 @@ PyObject * newcarrayobject_template<GenoIterator>(GenoIterator begin, GenoIterat
 	}
 	//
 	op->ob_iter = begin;
+#if PY_VERSION_HEX >= 0x030b0000
+#  ifdef MUTANTALLELE
+	Py_SET_SIZE(op, end.index() - begin.index());
+#  else
+	Py_SET_SIZE(op, end - begin);
+#  endif
+# else
 #  ifdef MUTANTALLELE
 	Py_SIZE(op) = end.index() - begin.index();
 #  else
 	Py_SIZE(op) = end - begin;
 #  endif
+#endif
 	return (PyObject *)op;
 }
 
@@ -708,7 +716,11 @@ PyObject * newcarrayobject_template<LineageIterator>(LineageIterator begin, Line
 	}
 	//
 	op->ob_iter = begin;
+#if PY_VERSION_HEX >= 0x030b0000
+	Py_SET_SIZE(op, end - begin);
+#else
 	Py_SIZE(op) = end - begin;
+#endif
 	return (PyObject *)op;
 }
 
@@ -1510,7 +1522,11 @@ PyObject * newcarrayobject_template<GenoIterator>(GenoIterator begin, GenoIterat
 	}
 	//
 	op->ob_iter = begin;
+#if PY_VERSION_HEX >= 0x030b0000
+	Py_SET_SIZE(op, end - begin);
+#else
 	Py_SIZE(op) = end - begin;
+#endif
 	return (PyObject *)op;
 }
 
@@ -1529,7 +1545,11 @@ PyObject * newcarrayobject_template<LineageIterator>(LineageIterator begin, Line
 	}
 	//
 	op->ob_iter = begin;
+#if PY_VERSION_HEX >= 0x030b0000
+	Py_SET_SIZE(op, end - begin);
+#else
 	Py_SIZE(op) = end - begin;
+#endif
 	return (PyObject *)op;
 }
 

diff --git a/src/customizedTypes.c b/src/customizedTypes.c
@@ -1513,13 +1513,21 @@ PyObject * PyDefDict_New()
 
 int initCustomizedTypes(PyObject * m)
 {
+#if PY_VERSION_HEX >= 0x030b0000
+	Py_SET_TYPE(&Arraytype, &PyType_Type);
+	if (PyType_Ready(&Arraytype) < 0)
+		return -1;
+	//
+	Py_SET_TYPE(&defdict_type, &PyType_Type);
+	defdict_type.tp_base = &PyDict_Type;
+#else
 	Py_TYPE(&Arraytype) = &PyType_Type;
 	if (PyType_Ready(&Arraytype) < 0)
 		return -1;
 	//
 	Py_TYPE(&defdict_type) = &PyType_Type;
 	defdict_type.tp_base = &PyDict_Type;
-
+#endif
 	if (PyType_Ready(&defdict_type) < 0)
 		return -1;
 

diff --git a/src/utility.cpp b/src/utility.cpp
@@ -88,7 +88,10 @@ using std::ofstream;
 
 // compile and eval enables compiling string to byte code
 #include "compile.h"
+
+#if PY_VERSION_HEX < 0x030b0000
 #include "eval.h"
+#endif
 
 // for kbhit
 #if  defined (_WIN32) || defined (__WIN32__)