diff --git a/pythoncapi_compat.h b/pythoncapi_compat.h
index 7c76858..2218b1b 100644
--- 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
index 5064550..2e92dba 100755
--- 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
index c413689..4f369f7 100644
--- 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 {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy