[3.13] gh-135839: Fix `module_traverse` and `module_clear` in subinterp modules ...

(cherry picked from commit bcc2cbaa7f112323939e853ed69fd82f19568ccf)

diff --git a/Modules/_interpqueuesmodule.c b/Modules/_interpqueuesmodule.c
index 6f050a988b1426088302cd3c1797b54c86149c1b..5818066eebe49aa07f9476c27dfdd7f7a6d46111 100644 (file)
--- a/Modules/_interpqueuesmodule.c
+++ b/Modules/_interpqueuesmodule.c
@@ -1937,8 +1937,7 @@ static int
 module_traverse(PyObject *mod, visitproc visit, void *arg)
 {
     module_state *state = get_module_state(mod);
-    traverse_module_state(state, visit, arg);
-    return 0;
+    return traverse_module_state(state, visit, arg);
 }
 
 static int
@@ -1947,8 +1946,7 @@ module_clear(PyObject *mod)
     module_state *state = get_module_state(mod);
 
     // Now we clear the module state.
-    clear_module_state(state);
-    return 0;
+    return clear_module_state(state);
 }
 
 static void

diff --git a/Modules/_interpretersmodule.c b/Modules/_interpretersmodule.c
index a8fbf987ab18b3812e0e6f4ce6aba678a1f5b572..4ff73d32d2095bde507b97b37fd2d4c7c97bf748 100644 (file)
--- a/Modules/_interpretersmodule.c
+++ b/Modules/_interpretersmodule.c
@@ -1540,8 +1540,7 @@ module_traverse(PyObject *mod, visitproc visit, void *arg)
 {
     module_state *state = get_module_state(mod);
     assert(state != NULL);
-    traverse_module_state(state, visit, arg);
-    return 0;
+    return traverse_module_state(state, visit, arg);
 }
 
 static int
@@ -1549,8 +1548,7 @@ module_clear(PyObject *mod)
 {
     module_state *state = get_module_state(mod);
     assert(state != NULL);
-    clear_module_state(state);
-    return 0;
+    return clear_module_state(state);
 }
 
 static void