Fix bug:
[ 1163563 ] Sub threads execute in restricted mode
basically by fixing bug 1010677 in a non-broken way.
Backport candidate.
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index 098a784..3025595 100644
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -413,10 +413,12 @@
t_bootstrap(void *boot_raw)
{
struct bootstate *boot = (struct bootstate *) boot_raw;
- PyGILState_STATE gstate;
+ PyThreadState *tstate;
PyObject *res;
- gstate = PyGILState_Ensure();
+ tstate = PyThreadState_New(boot->interp);
+
+ PyEval_AcquireThread(tstate);
res = PyEval_CallObjectWithKeywords(
boot->func, boot->args, boot->keyw);
if (res == NULL) {
@@ -441,7 +443,8 @@
Py_DECREF(boot->args);
Py_XDECREF(boot->keyw);
PyMem_DEL(boot_raw);
- PyGILState_Release(gstate);
+ PyThreadState_Clear(tstate);
+ PyThreadState_DeleteCurrent();
PyThread_exit_thread();
}