[Python-checkins] cpython (3.6): Issue #28214: Now __set_name__ is looked up on the class instead of the

Wed Sep 21 08:57:58 EDT 2016

https://hg.python.org/cpython/rev/1a2b8398f045
changeset: 103991:1a2b8398f045
branch: 3.6
parent: 103987:3ab4a374b5f0
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Sep 21 15:54:59 2016 +0300
summary:
 Issue #28214: Now __set_name__ is looked up on the class instead of the
instance.
files:
 Lib/test/test_subclassinit.py | 12 ++++++++++++
 Misc/NEWS | 3 +++
 Objects/typeobject.c | 12 +++++++-----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Lib/test/test_subclassinit.py b/Lib/test/test_subclassinit.py
--- a/Lib/test/test_subclassinit.py
+++ b/Lib/test/test_subclassinit.py
@@ -148,6 +148,18 @@
 class A:
 d = Descriptor()
 
+ def test_set_name_lookup(self):
+ resolved = []
+ class NonDescriptor:
+ def __getattr__(self, name):
+ resolved.append(name)
+
+ class A:
+ d = NonDescriptor()
+
+ self.assertNotIn('__set_name__', resolved,
+ '__set_name__ is looked up in instance dict')
+
 def test_set_name_init_subclass(self):
 class Descriptor:
 def __set_name__(self, owner, name):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #28214: Now __set_name__ is looked up on the class instead of the
+ instance.
+
 - Issue #27955: Fallback on reading /dev/urandom device when the getrandom()
 syscall fails with EPERM, for example when blocked by SECCOMP.
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -6990,19 +6990,21 @@
 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;
-- 
Repository URL: https://hg.python.org/cpython
