diff -r 45713818fd81 Lib/test/test_subclassinit.py --- a/Lib/test/test_subclassinit.py Thu Nov 24 23:31:59 2016 +0100 +++ b/Lib/test/test_subclassinit.py Fri Nov 25 09:02:54 2016 +0200 @@ -198,6 +198,22 @@ class Test(unittest.TestCase): self.assertIs(B.meta_owner, B) self.assertEqual(B.name, 'd') + def test_set_name_mutating_dict(self): + proceeded = [] + class Descriptor: + def __set_name__(self, owner, name): + setattr(owner, name + 'x', None) + proceeded.append(name) + + class A: + a = Descriptor() + b = Descriptor() + c = Descriptor() + d = Descriptor() + e = Descriptor() + + self.assertCountEqual(proceeded, ['a', 'b', 'c', 'd', 'e']) + def test_errors(self): class MyMeta(type): pass diff -r 45713818fd81 Objects/typeobject.c --- a/Objects/typeobject.c Thu Nov 24 23:31:59 2016 +0100 +++ b/Objects/typeobject.c Fri Nov 25 09:02:54 2016 +0200 @@ -7004,10 +7004,14 @@ update_all_slots(PyTypeObject* type) static int set_names(PyTypeObject *type) { - PyObject *key, *value, *set_name, *tmp; + PyObject *dict, *key, *value, *set_name, *tmp; Py_ssize_t i = 0; - while (PyDict_Next(type->tp_dict, &i, &key, &value)) { + dict = PyDict_Copy(type->tp_dict); + if (dict == NULL) + return -1; + + while (PyDict_Next(dict, &i, &key, &value)) { set_name = lookup_maybe(value, &PyId___set_name__); if (set_name != NULL) { tmp = PyObject_CallFunctionObjArgs(set_name, type, key, NULL); @@ -7017,15 +7021,19 @@ set_names(PyTypeObject *type) "Error calling __set_name__ on '%.100s' instance %R " "in '%.100s'", value->ob_type->tp_name, key, type->tp_name); + Py_DECREF(dict); return -1; } else Py_DECREF(tmp); } - else if (PyErr_Occurred()) + else if (PyErr_Occurred()) { + Py_DECREF(dict); return -1; - } - + } + } + + Py_DECREF(dict); return 0; }