summaryrefslogtreecommitdiffstats
path: root/Modules/_testcapimodule.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-13 02:22:00 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-12-13 02:22:00 (GMT)
commitcd0cb8ccd376186f08fd3ee2be0085f45f66b3d3 (patch)
tree1c376ce9b0303a145e93884229a96364c9088eba /Modules/_testcapimodule.c
parent24bd028092d0d8340980ff8d720d072b6288f355 (diff)
downloadcpython-cd0cb8ccd376186f08fd3ee2be0085f45f66b3d3.zip
cpython-cd0cb8ccd376186f08fd3ee2be0085f45f66b3d3.tar.gz
cpython-cd0cb8ccd376186f08fd3ee2be0085f45f66b3d3.tar.bz2
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.
Diffstat (limited to 'Modules/_testcapimodule.c')
-rw-r--r--Modules/_testcapimodule.c4
1 files changed, 4 insertions, 0 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);