Skip to content

gh-130821: Improve error messages for magic methods returning wrong type #154606

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

Closed
prabhleen-kaurr wants to merge 1 commit into from
+14 −13
Closed

gh-130821: Improve error messages for magic methods returning wrong type #154606

Show file tree
Hide file tree
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
23 changes: 12 additions & 11 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7950,16 +7950,16 @@ _PyObject_GetNewArguments(PyObject *obj, PyObject **args, PyObject **kwargs)
return -1;
}
if (!PyTuple_Check(newargs)) {
PyErr_Format(PyExc_TypeError,
"__getnewargs_ex__ should return a tuple, "
"not '%.200s'", Py_TYPE(newargs)->tp_name);
PyErr_Format(PyExc_TypeError,
"%T.__getnewargs_ex__() must return a tuple, "
"not %T", obj, newargs);
Py_DECREF(newargs);
return -1;
}
if (PyTuple_GET_SIZE(newargs) != 2) {
PyErr_Format(PyExc_ValueError,
"__getnewargs_ex__ should return a tuple of "
"length 2, not %zd", PyTuple_GET_SIZE(newargs));
"%T.__getnewargs_ex__() must return a tuple of "
"length 2, not %zd", obj, PyTuple_GET_SIZE(newargs));
Py_DECREF(newargs);
return -1;
}
Expand Down Expand Up @@ -8002,8 +8002,8 @@ _PyObject_GetNewArguments(PyObject *obj, PyObject **args, PyObject **kwargs)
}
if (!PyTuple_Check(*args)) {
PyErr_Format(PyExc_TypeError,
"__getnewargs__ should return a tuple, "
"not '%.200s'", Py_TYPE(*args)->tp_name);
"%T.__getnewargs__() must return a tuple, "
"not %T", obj, *args);
Py_CLEAR(*args);
return -1;
}
Expand Down Expand Up @@ -10759,9 +10759,10 @@ slot_tp_hash(PyObject *self)
return PyObject_HashNotImplemented(self);
}
if (!PyLong_Check(res)) {
PyErr_Format(PyExc_TypeError,
"%T.__hash__() must return an integer, not %T",
self, res);
Py_DECREF(res);
PyErr_SetString(PyExc_TypeError,
"__hash__ method should return an integer");
return -1;
}
/* Transform the PyLong `res` to a Py_hash_t `h`. For an existing
Expand Down Expand Up @@ -11030,8 +11031,8 @@ slot_tp_init(PyObject *self, PyObject *args, PyObject *kwds)
return -1;
if (res != Py_None) {
PyErr_Format(PyExc_TypeError,
"__init__() should return None, not '%.200s'",
Py_TYPE(res)->tp_name);
"%T.__init__() must return None, not %T",
self, res);
Py_DECREF(res);
return -1;
}
Expand Down
4 changes: 2 additions & 2 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4819,8 +4819,8 @@ dummy_func(
inst(EXIT_INIT_CHECK, (should_be_none -- )) {
if (!PyStackRef_IsNone(should_be_none)) {
PyErr_Format(PyExc_TypeError,
"__init__() should return None, not '%.200s'",
Py_TYPE(PyStackRef_AsPyObjectBorrow(should_be_none))->tp_name);
"__init__() must return None, not %T",
PyStackRef_AsPyObjectBorrow(should_be_none));
ERROR_NO_POP();
}
DEAD(should_be_none);
Expand Down
Loading