bpo-36763: _PyInitError always use int for exitcode by vstinner · Pull Request #13360 · python/cpython

Expand Up @@ -130,25 +130,21 @@ pymain_sys_path_add_path0(PyInterpreterState *interp, PyObject *path0) if (sysdict != NULL) { sys_path = _PyDict_GetItemIdWithError(sysdict, &PyId_path); if (sys_path == NULL && PyErr_Occurred()) { goto error; return -1; } } else { sys_path = NULL; } if (sys_path == NULL) { PyErr_SetString(PyExc_RuntimeError, "unable to get sys.path"); goto error; return -1; }
if (PyList_Insert(sys_path, 0, path0)) { goto error; return -1; } return 0;
error: PyErr_Print(); return -1; }

Expand Down Expand Up @@ -443,11 +439,9 @@ pymain_repl(_PyCoreConfig *config, PyCompilerFlags *cf, int *exitcode) }

static _PyInitError static void pymain_run_python(int *exitcode) { _PyInitError err;
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE(); /* pymain_run_stdin() modify the config */ _PyCoreConfig *config = &interp->core_config; Expand All @@ -464,22 +458,20 @@ pymain_run_python(int *exitcode)
if (main_importer_path != NULL) { if (pymain_sys_path_add_path0(interp, main_importer_path) < 0) { err = _Py_INIT_EXIT(1); goto done; goto error; } } else if (!config->isolated) { PyObject *path0 = NULL; if (_PyPathConfig_ComputeSysPath0(&config->argv, &path0)) { if (path0 == NULL) { err = _Py_INIT_NO_MEMORY(); goto done; } int res = _PyPathConfig_ComputeSysPath0(&config->argv, &path0); if (res < 0) { goto error; }
if (res > 0) { if (pymain_sys_path_add_path0(interp, path0) < 0) { Py_DECREF(path0); err = _Py_INIT_EXIT(1); goto done; goto error; } Py_DECREF(path0); } Expand Down Expand Up @@ -508,11 +500,14 @@ pymain_run_python(int *exitcode) }
pymain_repl(config, &cf, exitcode); err = _Py_INIT_OK(); goto done;
error: PyErr_Print(); *exitcode = 1;
done: Py_XDECREF(main_importer_path); return err; }

Expand Down Expand Up @@ -578,17 +573,14 @@ _Py_RunMain(void) { int exitcode = 0;
_PyInitError err = pymain_run_python(&exitcode); if (_Py_INIT_FAILED(err)) { pymain_exit_error(err); }
pymain_run_python(&exitcode); if (Py_FinalizeEx() < 0) { /* Value unlikely to be confused with a non-error exit status or other special meaning */ exitcode = 120; }
done: pymain_free();
if (_Py_UnhandledKeyboardInterrupt) { Expand All @@ -603,6 +595,10 @@ static int pymain_main(_PyArgv *args) { _PyInitError err = pymain_init(args); if (_Py_INIT_IS_EXIT(err)) { pymain_free(); return err.exitcode; } if (_Py_INIT_FAILED(err)) { pymain_exit_error(err); } Expand Down