diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2024-04-03 10:58:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 10:58:39 -0600 |
| commit | 976bcb2379709da57073a9e07b518ff51daa617a (patch) | |
| tree | 66fca9084cbae6c0b503491f627829d703df19bc /Python/crossinterp.c | |
| parent | 7ecd55d604a8fa287c1d131cac14d10260be826b (diff) | |
| download | cpython-976bcb2379709da57073a9e07b518ff51daa617a.tar.gz cpython-976bcb2379709da57073a9e07b518ff51daa617a.zip | |
gh-76785: Raise InterpreterError, Not RuntimeError (gh-117489)
I had meant to switch everything to InterpreterError when I added it a while back. At the time I missed a few key spots.
As part of this, I've added print-the-exception to _PyXI_InitTypes() and fixed an error case in `_PyStaticType_InitBuiltin().
Diffstat (limited to 'Python/crossinterp.c')
| -rw-r--r-- | Python/crossinterp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Python/crossinterp.c b/Python/crossinterp.c index 18dec4dd959..16efe9c3958 100644 --- a/Python/crossinterp.c +++ b/Python/crossinterp.c @@ -845,7 +845,7 @@ _PyXI_ApplyErrorCode(_PyXI_errcode code, PyInterpreterState *interp) return 0; case _PyXI_ERR_OTHER: // XXX msg? - PyErr_SetNone(PyExc_RuntimeError); + PyErr_SetNone(PyExc_InterpreterError); break; case _PyXI_ERR_NO_MEMORY: PyErr_NoMemory(); @@ -856,11 +856,11 @@ _PyXI_ApplyErrorCode(_PyXI_errcode code, PyInterpreterState *interp) _PyInterpreterState_FailIfRunningMain(interp); break; case _PyXI_ERR_MAIN_NS_FAILURE: - PyErr_SetString(PyExc_RuntimeError, + PyErr_SetString(PyExc_InterpreterError, "failed to get __main__ namespace"); break; case _PyXI_ERR_APPLY_NS_FAILURE: - PyErr_SetString(PyExc_RuntimeError, + PyErr_SetString(PyExc_InterpreterError, "failed to apply namespace to __main__"); break; case _PyXI_ERR_NOT_SHAREABLE: @@ -935,7 +935,7 @@ _PyXI_ApplyError(_PyXI_error *error) if (error->uncaught.type.name != NULL || error->uncaught.msg != NULL) { // __context__ will be set to a proxy of the propagated exception. PyObject *exc = PyErr_GetRaisedException(); - _PyXI_excinfo_Apply(&error->uncaught, PyExc_RuntimeError); + _PyXI_excinfo_Apply(&error->uncaught, PyExc_InterpreterError); PyObject *exc2 = PyErr_GetRaisedException(); PyException_SetContext(exc, exc2); PyErr_SetRaisedException(exc); @@ -1671,6 +1671,7 @@ PyStatus _PyXI_InitTypes(PyInterpreterState *interp) { if (init_exceptions(interp) < 0) { + PyErr_PrintEx(0); return _PyStatus_ERR("failed to initialize an exception type"); } return _PyStatus_OK(); |