Skip to content

bpo-38069: Convert _posixsubprocess to PEP-384 #15780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make _posixsubprocess PEP-384 compatible
66 changes: 58 additions & 8 deletions Modules/_posixsubprocess.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,28 @@

#define POSIX_CALL(call) do { if ((call) == -1) goto error; } while (0)

typedef struct {
PyObject* disable;
PyObject* enable;
PyObject* isenabled;
} _posixsubprocessstate;

static struct PyModuleDef _posixsubprocessmodule;

#define _posixsubprocessstate(o) ((_posixsubprocessstate *)PyModule_GetState(o))
#define _posixsubprocessstate_global _posixsubprocessstate(PyState_FindModule(&_posixsubprocessmodule))

/* If gc was disabled, call gc.enable(). Return 0 on success. */
static int
_enable_gc(int need_to_reenable_gc, PyObject *gc_module)
{
PyObject *result;
_Py_IDENTIFIER(enable);
PyObject *exctype, *val, *tb;

if (need_to_reenable_gc) {
PyErr_Fetch(&exctype, &val, &tb);
result = _PyObject_CallMethodIdNoArgs(gc_module, &PyId_enable);
result = _PyObject_CallMethodNoArgs(
gc_module, _posixsubprocessstate_global->enable);
if (exctype != NULL) {
PyErr_Restore(exctype, val, tb);
}
Expand Down Expand Up @@ -602,13 +612,12 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
/* We need to call gc.disable() when we'll be calling preexec_fn */
if (preexec_fn != Py_None) {
PyObject *result;
_Py_IDENTIFIER(isenabled);
_Py_IDENTIFIER(disable);

gc_module = PyImport_ImportModule("gc");
if (gc_module == NULL)
return NULL;
result = _PyObject_CallMethodIdNoArgs(gc_module, &PyId_isenabled);
result = _PyObject_CallMethodNoArgs(
gc_module, _posixsubprocessstate_global->isenabled);
if (result == NULL) {
Py_DECREF(gc_module);
return NULL;
Expand All @@ -619,7 +628,8 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
Py_DECREF(gc_module);
return NULL;
}
result = _PyObject_CallMethodIdNoArgs(gc_module, &PyId_disable);
result = _PyObject_CallMethodNoArgs(
gc_module, _posixsubprocessstate_global->disable);
if (result == NULL) {
Py_DECREF(gc_module);
return NULL;
Expand Down Expand Up @@ -798,16 +808,56 @@ static PyMethodDef module_methods[] = {
};


static int _posixsubprocess_traverse(PyObject *m, visitproc visit, void *arg) {
Py_VISIT(_posixsubprocessstate(m)->disable);
Py_VISIT(_posixsubprocessstate(m)->enable);
Py_VISIT(_posixsubprocessstate(m)->isenabled);
return 0;
}

static int _posixsubprocess_clear(PyObject *m) {
Py_CLEAR(_posixsubprocessstate(m)->disable);
Py_CLEAR(_posixsubprocessstate(m)->enable);
Py_CLEAR(_posixsubprocessstate(m)->isenabled);
return 0;
}

static void _posixsubprocess_free(void *m) {
_posixsubprocess_clear((PyObject *)m);
}

static struct PyModuleDef _posixsubprocessmodule = {
PyModuleDef_HEAD_INIT,
"_posixsubprocess",
module_doc,
-1, /* No memory is needed. */
sizeof(_posixsubprocessstate),
module_methods,
NULL,
_posixsubprocess_traverse,
_posixsubprocess_clear,
_posixsubprocess_free,
};

PyMODINIT_FUNC
PyInit__posixsubprocess(void)
{
return PyModule_Create(&_posixsubprocessmodule);
PyObject* m;

m = PyState_FindModule(&_posixsubprocessmodule);
if (m != NULL) {
Py_INCREF(m);
return m;
}

m = PyModule_Create(&_posixsubprocessmodule);
if (m == NULL) {
return NULL;
}

_posixsubprocessstate(m)->disable = PyUnicode_InternFromString("disable");
_posixsubprocessstate(m)->enable = PyUnicode_InternFromString("enable");
_posixsubprocessstate(m)->isenabled = PyUnicode_InternFromString("isenabled");

PyState_AddModule(m, &_posixsubprocessmodule);
return m;
}