ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpo-40234: Revert "bpo-37266: Daemon threads are now denied in subinterpreters (GH-14049)" (GH-19456)

Browse source 
This reverts commit 066e5b1a91.
This commit is contained in:
Victor Stinner 2020-04-12 23:45:09 +02:00 • committed by GitHub
parent 909b87d2bb
commit 14d5331eb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Modules/_threadmodule.c
View file

@ -8,14 +8,6 @@
#include "structmember.h" /* offsetof */
#include "pythread.h"
#include "clinic/_threadmodule.c.h"
/*[clinic input]
module _thread
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=be8dbe5cc4b16df7]*/
static PyObject *ThreadError;
static PyObject *str_dict;
@ -1493,21 +1485,6 @@ PyDoc_STRVAR(excepthook_doc,
\n\
Handle uncaught Thread.run() exception.");
/*[clinic input]
_thread._is_main_interpreter
Return True if the current interpreter is the main Python interpreter.
[clinic start generated code]*/
static PyObject *
_thread__is_main_interpreter_impl(PyObject *module)
/*[clinic end generated code: output=7dd82e1728339adc input=cc1eb00fd4598915]*/
{
PyThreadState *tstate = _PyThreadState_GET();
int is_main = _Py_IsMainInterpreter(tstate);
return PyBool_FromLong(is_main);
}
static PyMethodDef thread_methods[] = {
{"start_new_thread", (PyCFunction)thread_PyThread_start_new_thread,
METH_VARARGS, start_new_doc},
@ -1537,7 +1514,6 @@ static PyMethodDef thread_methods[] = {
METH_NOARGS, _set_sentinel_doc},
{"_excepthook", thread_excepthook,
METH_O, excepthook_doc},
_THREAD__IS_MAIN_INTERPRETER_METHODDEF
{NULL, NULL} /* sentinel */
};

22
Modules/clinic/_threadmodule.c.h generated
View file

@ -1,22 +0,0 @@
/*[clinic input]
preserve
[clinic start generated code]*/
PyDoc_STRVAR(_thread__is_main_interpreter__doc__,
"_is_main_interpreter($module, /)\n"
"--\n"
"\n"
"Return True if the current interpreter is the main Python interpreter.");
#define _THREAD__IS_MAIN_INTERPRETER_METHODDEF \
{"_is_main_interpreter", (PyCFunction)_thread__is_main_interpreter, METH_NOARGS, _thread__is_main_interpreter__doc__},
static PyObject *
_thread__is_main_interpreter_impl(PyObject *module);
static PyObject *
_thread__is_main_interpreter(PyObject *module, PyObject *Py_UNUSED(ignored))
{
return _thread__is_main_interpreter_impl(module);
}
/*[clinic end generated code: output=505840d1b9101789 input=a9049054013a1b77]*/