Skip to content

gh-76785: Raise InterpreterError, Not RuntimeError #117489

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
ericsnowcurrently merged 5 commits into from
Apr 3, 2024
Merged

gh-76785: Raise InterpreterError, Not RuntimeError #117489

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90d632c
Properly clean up when type_ready() fails.
ericsnowcurrently Apr 1, 2024
d607b15
Print the exception when _PyXI_InitTypes() fails.
ericsnowcurrently Apr 1, 2024
a0b7c78
Make InterpreterError and InterpreterNotFoundError subclassable.
ericsnowcurrently Apr 1, 2024
d048d77
Raise InterpreterError instead of RuntimeError.
ericsnowcurrently Apr 1, 2024
b133aa7
Fix a few more cases.
ericsnowcurrently Apr 3, 2024
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
Prev Previous commit
Next Next commit
Make InterpreterError and InterpreterNotFoundError subclassable.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 2, 2024
commit a0b7c78b2f7dbc77cadfd4a4acd6bf560ab78950
17 changes: 16 additions & 1 deletion Python/crossinterp_exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ static PyTypeObject _PyExc_InterpreterError = {
PyVarObject_HEAD_INIT(NULL, 0)
.tp_name = "interpreters.InterpreterError",
.tp_doc = PyDoc_STR("A cross-interpreter operation failed"),
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
//.tp_traverse = ((PyTypeObject *)PyExc_BaseException)->tp_traverse,
//.tp_clear = ((PyTypeObject *)PyExc_BaseException)->tp_clear,
//.tp_base = (PyTypeObject *)PyExc_BaseException,
};
PyObject *PyExc_InterpreterError = (PyObject *)&_PyExc_InterpreterError;
Expand All @@ -15,6 +18,9 @@ static PyTypeObject _PyExc_InterpreterNotFoundError = {
PyVarObject_HEAD_INIT(NULL, 0)
.tp_name = "interpreters.InterpreterNotFoundError",
.tp_doc = PyDoc_STR("An interpreter was not found"),
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
//.tp_traverse = ((PyTypeObject *)PyExc_BaseException)->tp_traverse,
//.tp_clear = ((PyTypeObject *)PyExc_BaseException)->tp_clear,
.tp_base = &_PyExc_InterpreterError,
};
PyObject *PyExc_InterpreterNotFoundError = (PyObject *)&_PyExc_InterpreterNotFoundError;
Expand Down Expand Up @@ -55,16 +61,25 @@ _get_not_shareable_error_type(PyInterpreterState *interp)
static int
init_exceptions(PyInterpreterState *interp)
{
PyTypeObject *base = (PyTypeObject *)PyExc_BaseException;

// builtin static types
_PyExc_InterpreterError.tp_base = (PyTypeObject *)PyExc_BaseException;

_PyExc_InterpreterError.tp_base = base;
_PyExc_InterpreterError.tp_traverse = base->tp_traverse;
_PyExc_InterpreterError.tp_clear = base->tp_clear;
if (_PyStaticType_InitBuiltin(interp, &_PyExc_InterpreterError) < 0) {
return -1;
}

_PyExc_InterpreterNotFoundError.tp_traverse = base->tp_traverse;
_PyExc_InterpreterNotFoundError.tp_clear = base->tp_clear;
if (_PyStaticType_InitBuiltin(interp, &_PyExc_InterpreterNotFoundError) < 0) {
return -1;
}

// heap types

// We would call _init_not_shareable_error_type() here too,
// but that leads to ref leaks

Expand Down