[3.14] gh-135839: Fix module_traverse and module_clear in _interpchannelsmodule (GH-135840) (#135918)

miss-islington · sobolevn · web-flow · commit 93a31bedd952 · 2025-06-25T09:20:29.000Z
gh-135839: Fix `module_traverse` and `module_clear` in `_interpchannelsmodule` (GH-135840) (cherry picked from commit dd59c78) Co-authored-by: sobolevn <mail@sobolevn.me>
diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c
@@ -3614,8 +3614,7 @@ module_traverse(PyObject *mod, visitproc visit, void *arg)
 {
     module_state *state = get_module_state(mod);
     assert(state != NULL);
-    (void)traverse_module_state(state, visit, arg);
-    return 0;
+    return traverse_module_state(state, visit, arg);
 }
 
 static int
@@ -3625,8 +3624,7 @@ module_clear(PyObject *mod)
     assert(state != NULL);
 
     // Now we clear the module state.
-    (void)clear_module_state(state);
-    return 0;
+    return clear_module_state(state);
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -3614,8 +3614,7 @@ module_traverse(PyObject mod, visitproc visit, void arg)`
`3614`	`3614`	`{`
`3615`	`3615`	`module_state *state = get_module_state(mod);`
`3616`	`3616`	`assert(state != NULL);`
`3617`		`- (void)traverse_module_state(state, visit, arg);`
`3618`		`- return 0;`
	`3617`	`+ return traverse_module_state(state, visit, arg);`
`3619`	`3618`	`}`
`3620`	`3619`
`3621`	`3620`	`static int`
`@@ -3625,8 +3624,7 @@ module_clear(PyObject *mod)`
`3625`	`3624`	`assert(state != NULL);`
`3626`	`3625`
`3627`	`3626`	`// Now we clear the module state.`
`3628`		`- (void)clear_module_state(state);`
`3629`		`- return 0;`
	`3627`	`+ return clear_module_state(state);`
`3630`	`3628`	`}`
`3631`	`3629`
`3632`	`3630`	`static void`