Skip to content

bpo-39908: Remove unused args from two functions #18867

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
Mar 12, 2020
Merged

bpo-39908: Remove unused args from two functions #18867

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
11 changes: 5 additions & 6 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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_set_builtins_open(void);
static PyStatus init_sys_streams(PyThreadState *tstate);
static PyStatus init_signals(PyThreadState *tstate);
static void call_py_exitfuncs(PyThreadState *tstate);
Expand Down Expand Up @@ -1019,7 +1019,7 @@ init_interp_main(PyThreadState *tstate)
return status;
}

status = init_set_builtins_open(tstate);
status = init_set_builtins_open();
if (_PyStatus_EXCEPTION(status)) {
return status;
}
Expand Down Expand Up @@ -1872,7 +1872,7 @@ create_stdio(const PyConfig *config, PyObject* io,

/* Set builtins.open to io.OpenWrapper */
static PyStatus
init_set_builtins_open(PyThreadState *tstate)
init_set_builtins_open(void)
{
PyObject *iomod = NULL, *wrapper;
PyObject *bimod = NULL;
Expand Down Expand Up @@ -2040,9 +2040,8 @@ _Py_FatalError_DumpTracebacks(int fd, PyInterpreterState *interp,
Return 1 if the traceback was displayed, 0 otherwise. */

static int
_Py_FatalError_PrintExc(int fd)
_Py_FatalError_PrintExc(PyThreadState *tstate)
{
PyThreadState *tstate = _PyThreadState_GET();
PyObject *ferr, *res;
PyObject *exception, *v, *tb;
int has_tb;
Expand Down Expand Up @@ -2204,7 +2203,7 @@ fatal_error(const char *prefix, const char *msg, int status)
int has_tstate_and_gil = (tss_tstate != NULL && tss_tstate == tstate);
if (has_tstate_and_gil) {
/* If an exception is set, print the exception with its traceback */
if (!_Py_FatalError_PrintExc(fd)) {
if (!_Py_FatalError_PrintExc(tss_tstate)) {
/* No exception is set, or an exception is set without traceback */
_Py_FatalError_DumpTracebacks(fd, interp, tss_tstate);
}
Expand Down