Close #19787: PyThread_set_key_value() now always set the value. In Python 3.3,

the function did nothing if the key already exists (if the current value is a
non-NULL pointer).

_testcapi.run_in_subinterp() now correctly sets the new Python thread state of
the current thread when a subinterpreter is created.

2 files changed, 7 insertions, 6 deletions

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index a0cffde..6f2a75c 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2511,6 +2511,10 @@ 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 b39e950..95b05d6 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -168,14 +168,11 @@ 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 {
-        /* 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);
+        assert(PyThread_get_key_value(tracemalloc_reentrant_key) == REENTRANT);
+        PyThread_set_key_value(tracemalloc_reentrant_key, NULL);
     }
 }