Fix old Python and PyPy

vstinner · vstinner · commit b053c89d8b14 · 2024-05-23T00:57:40.000+02:00
diff --git a/pythoncapi_compat.h b/pythoncapi_compat.h
@@ -1338,7 +1338,7 @@ PyDict_SetDefaultRef(PyObject *d, PyObject *key, PyObject *default_value,
 }
 #endif
 
-#if PY_VERSION_HEX < 0x030E0000
+#if PY_VERSION_HEX < 0x030E0000 && PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION)
 typedef struct PyUnicodeWriter PyUnicodeWriter;
 
 static inline PyUnicodeWriter* PyUnicodeWriter_Create(void)
diff --git a/tests/test_pythoncapi_compat_cext.c b/tests/test_pythoncapi_compat_cext.c
@@ -1727,6 +1727,9 @@ test_get_constant(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
 }
 
 
+#if PY_VERSION_HEX < 0x030E0000 && PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION)
+#define TEST_UNICODEWRITER 1
+
 static PyObject *
 test_unicodewriter(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(args))
 {
@@ -1821,6 +1824,7 @@ test_unicodewriter_format(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(args))
     PyUnicodeWriter_Free(writer);
     return NULL;
 }
+#endif
 
 
 static struct PyMethodDef methods[] = {
@@ -1861,8 +1865,10 @@ static struct PyMethodDef methods[] = {
     {"test_time", test_time, METH_NOARGS, _Py_NULL},
 #endif
     {"test_get_constant", test_get_constant, METH_NOARGS, _Py_NULL},
+#ifdef TEST_UNICODEWRITER
     {"test_unicodewriter", test_unicodewriter, METH_NOARGS, _Py_NULL},
     {"test_unicodewriter_format", test_unicodewriter_format, METH_NOARGS, _Py_NULL},
+#endif
     {_Py_NULL, _Py_NULL, 0, _Py_NULL}
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1338,7 +1338,7 @@ PyDict_SetDefaultRef(PyObject d, PyObject key, PyObject *default_value,`
`1338`	`1338`	`}`
`1339`	`1339`	`#endif`
`1340`	`1340`
`1341`		`-#if PY_VERSION_HEX < 0x030E0000`
	`1341`	`+#if PY_VERSION_HEX < 0x030E0000 && PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION)`
`1342`	`1342`	`typedef struct PyUnicodeWriter PyUnicodeWriter;`
`1343`	`1343`
`1344`	`1344`	`static inline PyUnicodeWriter* PyUnicodeWriter_Create(void)`