Commit 288f219f authored by Serhiy Storchaka's avatar Serhiy Storchaka

Issue #28797: Modifying the class __dict__ inside the __set_name__ method of

 a descriptor that is used inside that class no longer prevents calling the
 __set_name__ method of other descriptors.
parent a88fb0a3
...@@ -198,6 +198,22 @@ class Test(unittest.TestCase): ...@@ -198,6 +198,22 @@ class Test(unittest.TestCase):
self.assertIs(B.meta_owner, B) self.assertIs(B.meta_owner, B)
self.assertEqual(B.name, 'd') self.assertEqual(B.name, 'd')
def test_set_name_modifying_dict(self):
notified = []
class Descriptor:
def __set_name__(self, owner, name):
setattr(owner, name + 'x', None)
notified.append(name)
class A:
a = Descriptor()
b = Descriptor()
c = Descriptor()
d = Descriptor()
e = Descriptor()
self.assertCountEqual(notified, ['a', 'b', 'c', 'd', 'e'])
def test_errors(self): def test_errors(self):
class MyMeta(type): class MyMeta(type):
pass pass
......
...@@ -10,6 +10,10 @@ What's New in Python 3.6.0 release candidate 1 ...@@ -10,6 +10,10 @@ What's New in Python 3.6.0 release candidate 1
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #28797: Modifying the class __dict__ inside the __set_name__ method of
a descriptor that is used inside that class no longer prevents calling the
__set_name__ method of other descriptors.
- Issue #28782: Fix a bug in the implementation ``yield from`` when checking - Issue #28782: Fix a bug in the implementation ``yield from`` when checking
if the next instruction is YIELD_FROM. Regression introduced by WORDCODE if the next instruction is YIELD_FROM. Regression introduced by WORDCODE
(issue #26647). (issue #26647).
......
...@@ -7004,10 +7004,14 @@ update_all_slots(PyTypeObject* type) ...@@ -7004,10 +7004,14 @@ update_all_slots(PyTypeObject* type)
static int static int
set_names(PyTypeObject *type) set_names(PyTypeObject *type)
{ {
PyObject *key, *value, *set_name, *tmp; PyObject *names_to_set, *key, *value, *set_name, *tmp;
Py_ssize_t i = 0; Py_ssize_t i = 0;
while (PyDict_Next(type->tp_dict, &i, &key, &value)) { names_to_set = PyDict_Copy(type->tp_dict);
if (names_to_set == NULL)
return -1;
while (PyDict_Next(names_to_set, &i, &key, &value)) {
set_name = lookup_maybe(value, &PyId___set_name__); set_name = lookup_maybe(value, &PyId___set_name__);
if (set_name != NULL) { if (set_name != NULL) {
tmp = PyObject_CallFunctionObjArgs(set_name, type, key, NULL); tmp = PyObject_CallFunctionObjArgs(set_name, type, key, NULL);
...@@ -7017,15 +7021,19 @@ set_names(PyTypeObject *type) ...@@ -7017,15 +7021,19 @@ set_names(PyTypeObject *type)
"Error calling __set_name__ on '%.100s' instance %R " "Error calling __set_name__ on '%.100s' instance %R "
"in '%.100s'", "in '%.100s'",
value->ob_type->tp_name, key, type->tp_name); value->ob_type->tp_name, key, type->tp_name);
Py_DECREF(names_to_set);
return -1; return -1;
} }
else else
Py_DECREF(tmp); Py_DECREF(tmp);
} }
else if (PyErr_Occurred()) else if (PyErr_Occurred()) {
Py_DECREF(names_to_set);
return -1; return -1;
} }
}
Py_DECREF(names_to_set);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment