prepare for pypy3.11 release (#123)

mattip · web-flow · commit 0f1d42a10a3f · 2024-11-19T09:09:30.000+01:00
diff --git a/pythoncapi_compat.h b/pythoncapi_compat.h
@@ -287,7 +287,7 @@ PyFrame_GetVarString(PyFrameObject *frame, const char *name)
 
 
 // bpo-39947 added PyThreadState_GetInterpreter() to Python 3.9.0a5
-#if PY_VERSION_HEX < 0x030900A5 || defined(PYPY_VERSION)
+#if PY_VERSION_HEX < 0x030900A5 || (defined(PYPY_VERSION) && PY_VERSION_HEX < 0x030B0000)
 static inline PyInterpreterState *
 PyThreadState_GetInterpreter(PyThreadState *tstate)
 {
@@ -918,7 +918,7 @@ static inline int
 PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
 {
     PyObject **dict = _PyObject_GetDictPtr(obj);
-    if (*dict == NULL) {
+    if (dict == NULL || *dict == NULL) {
         return -1;
     }
     Py_VISIT(*dict);
@@ -929,7 +929,7 @@ static inline void
 PyObject_ClearManagedDict(PyObject *obj)
 {
     PyObject **dict = _PyObject_GetDictPtr(obj);
-    if (*dict == NULL) {
+    if (dict == NULL || *dict == NULL) {
         return;
     }
     Py_CLEAR(*dict);
diff --git a/runtests.py b/runtests.py
@@ -13,7 +13,6 @@
 import argparse
 import os.path
 import shutil
-import subprocess
 import sys
 try:
     from shutil import which
diff --git a/tests/test_pythoncapi_compat_cext.c b/tests/test_pythoncapi_compat_cext.c
@@ -758,7 +758,7 @@ test_import(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
 static void
 gc_collect(void)
 {
-#if defined(PYPY_VERSION)
+#if defined(PYPY_VERSION) && PY_VERSION_HEX < 0x030B0000
     PyObject *mod = PyImport_ImportModule("gc");
     assert(mod != _Py_NULL);
 
@@ -1432,8 +1432,8 @@ test_long_api(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
 
 // --- HeapCTypeWithManagedDict --------------------------------------------
 
-// Py_TPFLAGS_MANAGED_DICT was added to Python 3.11.0a3
-#if PY_VERSION_HEX >= 0x030B00A3
+// Py_TPFLAGS_MANAGED_DICT was added to Python 3.11.0a3 but is not implemented on PyPy
+#if PY_VERSION_HEX >= 0x030B00A3 && ! defined(PYPY_VERSION)
 #  define TEST_MANAGED_DICT
 
 typedef struct {

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ PyFrame_GetVarString(PyFrameObject frame, const char name)`
`287`	`287`
`288`	`288`
`289`	`289`	`// bpo-39947 added PyThreadState_GetInterpreter() to Python 3.9.0a5`
`290`		`-#if PY_VERSION_HEX < 0x030900A5 \|\| defined(PYPY_VERSION)`
	`290`	`+#if PY_VERSION_HEX < 0x030900A5 \|\| (defined(PYPY_VERSION) && PY_VERSION_HEX < 0x030B0000)`
`291`	`291`	`static inline PyInterpreterState *`
`292`	`292`	`PyThreadState_GetInterpreter(PyThreadState *tstate)`
`293`	`293`	`{`
`@@ -918,7 +918,7 @@ static inline int`
`918`	`918`	`PyObject_VisitManagedDict(PyObject obj, visitproc visit, void arg)`
`919`	`919`	`{`
`920`	`920`	`PyObject **dict = _PyObject_GetDictPtr(obj);`
`921`		`- if (*dict == NULL) {`
	`921`	`+ if (dict == NULL \|\| *dict == NULL) {`
`922`	`922`	`return -1;`
`923`	`923`	`}`
`924`	`924`	`Py_VISIT(*dict);`
`@@ -929,7 +929,7 @@ static inline void`
`929`	`929`	`PyObject_ClearManagedDict(PyObject *obj)`
`930`	`930`	`{`
`931`	`931`	`PyObject **dict = _PyObject_GetDictPtr(obj);`
`932`		`- if (*dict == NULL) {`
	`932`	`+ if (dict == NULL \|\| *dict == NULL) {`
`933`	`933`	`return;`
`934`	`934`	`}`
`935`	`935`	`Py_CLEAR(*dict);`