Backout changeset 46393019b650

test_capi is failing and the fix is not trivial, I prefer to revert

2 files changed, 6 insertions, 7 deletions

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 6f2a75c..a0cffde 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2511,10 +2511,6 @@ run_in_subinterp(PyObject *self, PyObject *args)
     r = PyRun_SimpleString(code);
     Py_EndInterpreter(substate);
 
-    /* restore previous thread safe. It was replaced by Py_NewInterpreter()
-       which creates a new thread state. */
-    _PyThreadState_Init(mainstate);
-
     PyThreadState_Swap(mainstate);
 
     return PyLong_FromLong(r);
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 95b05d6..b39e950 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -168,11 +168,14 @@ set_reentrant(int reentrant)
     assert(reentrant == 0 || reentrant == 1);
     if (reentrant) {
         assert(PyThread_get_key_value(tracemalloc_reentrant_key) == NULL);
-        PyThread_set_key_value(tracemalloc_reentrant_key, REENTRANT);
+        PyThread_set_key_value(tracemalloc_reentrant_key,
+                               REENTRANT);
     }
     else {
-        assert(PyThread_get_key_value(tracemalloc_reentrant_key) == REENTRANT);
-        PyThread_set_key_value(tracemalloc_reentrant_key, NULL);
+        /* FIXME: PyThread_set_key_value() cannot be used to set the flag
+           to zero, because it does nothing if the variable has already
+           a value set. */
+        PyThread_delete_key_value(tracemalloc_reentrant_key);
     }
 }