mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #28214: Now __set_name__ is looked up on the class instead of the

Browse source 
instance.
This commit is contained in:
Serhiy Storchaka 2016-09-21 15:54:59 +03:00
parent b00e00c339
commit afd02a439f
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/typeobject.c
View file

@ -6990,19 +6990,21 @@ update_all_slots(PyTypeObject* type)
static int
set_names(PyTypeObject *type)
{
PyObject *key, *value, *tmp;
PyObject *key, *value, *set_name, *tmp;
Py_ssize_t i = 0;
while (PyDict_Next(type->tp_dict, &i, &key, &value)) {
if (PyObject_HasAttr(value, _PyUnicode_FromId(&PyId___set_name__))) {
tmp = PyObject_CallMethodObjArgs(
value, _PyUnicode_FromId(&PyId___set_name__),
type, key, NULL);
set_name = lookup_maybe(value, &PyId___set_name__);
if (set_name != NULL) {
tmp = PyObject_CallFunctionObjArgs(set_name, type, key, NULL);
Py_DECREF(set_name);
if (tmp == NULL)
return -1;
else
Py_DECREF(tmp);
}
else if (PyErr_Occurred())
return -1;
}
return 0;