Skip to content

bpo-38858: Add init_set_builtins_open() subfunction #17346

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.

Sign up for GitHub

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 1 commit into from
Nov 22, 2019
Merged

bpo-38858: Add init_set_builtins_open() subfunction #17346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 50 additions & 18 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ extern grammar _PyParser_Grammar; /* From graminit.c */
/* Forward declarations */
static PyStatus add_main_module(PyInterpreterState *interp);
static PyStatus init_import_site(void);
static PyStatus init_set_builtins_open(PyThreadState *tstate);
static PyStatus init_sys_streams(PyThreadState *tstate);
static PyStatus init_signals(PyThreadState *tstate);
static void call_py_exitfuncs(PyThreadState *tstate);
Expand Down Expand Up @@ -994,6 +995,11 @@ pyinit_main(PyThreadState *tstate)
return status;
}

status = init_set_builtins_open(tstate);
if (_PyStatus_EXCEPTION(status)) {
return status;
}

/* Initialize warnings. */
PyObject *warnoptions = PySys_GetObject("warnoptions");
if (warnoptions != NULL && PyList_Size(warnoptions) > 0)
Expand Down Expand Up @@ -1569,6 +1575,11 @@ new_interpreter(PyThreadState **tstate_p)
return status;
}

status = init_set_builtins_open(tstate);
if (_PyStatus_EXCEPTION(status)) {
return status;
}

status = add_main_module(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
Expand Down Expand Up @@ -1891,12 +1902,49 @@ create_stdio(const PyConfig *config, PyObject* io,
return NULL;
}

/* Initialize sys.stdin, stdout, stderr and builtins.open */
/* Set builtins.open to io.OpenWrapper */
static PyStatus
init_sys_streams(PyThreadState *tstate)
init_set_builtins_open(PyThreadState *tstate)
{
PyObject *iomod = NULL, *wrapper;
PyObject *bimod = NULL;
PyStatus res = _PyStatus_OK();

if (!(iomod = PyImport_ImportModule("io"))) {
goto error;
}

if (!(bimod = PyImport_ImportModule("builtins"))) {
goto error;
}

if (!(wrapper = PyObject_GetAttrString(iomod, "OpenWrapper"))) {
goto error;
}

/* Set builtins.open */
if (PyObject_SetAttrString(bimod, "open", wrapper) == -1) {
Py_DECREF(wrapper);
goto error;
}
Py_DECREF(wrapper);
goto done;

error:
res = _PyStatus_ERR("can't initialize io.open");

done:
Py_XDECREF(bimod);
Py_XDECREF(iomod);
return res;
}


/* Initialize sys.stdin, stdout, stderr and builtins.open */
static PyStatus
init_sys_streams(PyThreadState *tstate)
{
PyObject *iomod = NULL;
PyObject *m;
PyObject *std = NULL;
int fd;
Expand Down Expand Up @@ -1929,23 +1977,9 @@ init_sys_streams(PyThreadState *tstate)
}
Py_DECREF(m);

if (!(bimod = PyImport_ImportModule("builtins"))) {
goto error;
}

if (!(iomod = PyImport_ImportModule("io"))) {
goto error;
}
if (!(wrapper = PyObject_GetAttrString(iomod, "OpenWrapper"))) {
goto error;
}

/* Set builtins.open */
if (PyObject_SetAttrString(bimod, "open", wrapper) == -1) {
Py_DECREF(wrapper);
goto error;
}
Py_DECREF(wrapper);

/* Set sys.stdin */
fd = fileno(stdin);
Expand Down Expand Up @@ -2013,8 +2047,6 @@ init_sys_streams(PyThreadState *tstate)

done:
_Py_ClearStandardStreamEncoding();

Py_XDECREF(bimod);
Py_XDECREF(iomod);
return res;
}
Expand Down