mirror of
https://github.com/python/cpython.git
synced 2025-07-19 01:05:26 +00:00
bpo-44655: Include the name of the type in unset __slots__ attribute errors (GH-27199)
This commit is contained in:
parent
6714dec5e1
commit
f783428a23
3 changed files with 17 additions and 4 deletions
|
@ -5,11 +5,11 @@
|
|||
#include "structmember.h" // PyMemberDef
|
||||
|
||||
PyObject *
|
||||
PyMember_GetOne(const char *addr, PyMemberDef *l)
|
||||
PyMember_GetOne(const char *obj_addr, PyMemberDef *l)
|
||||
{
|
||||
PyObject *v;
|
||||
|
||||
addr += l->offset;
|
||||
const char* addr = obj_addr + l->offset;
|
||||
switch (l->type) {
|
||||
case T_BOOL:
|
||||
v = PyBool_FromLong(*(char*)addr);
|
||||
|
@ -69,8 +69,13 @@ PyMember_GetOne(const char *addr, PyMemberDef *l)
|
|||
break;
|
||||
case T_OBJECT_EX:
|
||||
v = *(PyObject **)addr;
|
||||
if (v == NULL)
|
||||
PyErr_SetString(PyExc_AttributeError, l->name);
|
||||
if (v == NULL) {
|
||||
PyObject *obj = (PyObject *)obj_addr;
|
||||
PyTypeObject *tp = Py_TYPE(obj);
|
||||
PyErr_Format(PyExc_AttributeError,
|
||||
"'%.200s' object has no attribute '%s'",
|
||||
tp->tp_name, l->name);
|
||||
}
|
||||
Py_XINCREF(v);
|
||||
break;
|
||||
case T_LONGLONG:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue