mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-36433: fix confusing error messages in classmethoddescr_call (GH-12556) 

https://bugs.python.org/issue36433
This commit is contained in:
Inada Naoki 2019-03-26 18:26:33 +09:00 committed by Miss Islington (bot)
parent b4d8f28a8a
commit 871309c775
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/test/test_descr.py
View File

@ -1597,12 +1597,27 @@ class SubSpam(spam.spamlist): pass
self.assertEqual(x2, SubSpam) self.assertEqual(x2, SubSpam)
self.assertEqual(a2, a1) self.assertEqual(a2, a1)
self.assertEqual(d2, d1) self.assertEqual(d2, d1)
with self.assertRaises(TypeError):
with self.assertRaises(TypeError) as cm:
spam_cm() spam_cm()
with self.assertRaises(TypeError): self.assertEqual(
str(cm.exception),
"descriptor 'classmeth' of 'xxsubtype.spamlist' "
"object needs an argument")
with self.assertRaises(TypeError) as cm:
spam_cm(spam.spamlist()) spam_cm(spam.spamlist())
with self.assertRaises(TypeError): self.assertEqual(
str(cm.exception),
"descriptor 'classmeth' requires a type "
"but received a 'xxsubtype.spamlist' instance")
with self.assertRaises(TypeError) as cm:
spam_cm(list) spam_cm(list)
self.assertEqual(
str(cm.exception),
"descriptor 'classmeth' requires a subtype of 'xxsubtype.spamlist' "
"but received 'list'")
def test_staticmethods(self): def test_staticmethods(self):
# Testing static methods... # Testing static methods...

1
Misc/NEWS.d/next/Core and Builtins/2019-03-26-17-23-02.bpo-36433.-8XzZf.rst Normal file
View File

@ -0,0 +1 @@
Fixed TypeError message in classmethoddescr_call.

10
Objects/descrobject.c
View File

@ -315,20 +315,18 @@ classmethoddescr_call(PyMethodDescrObject *descr, PyObject *args,
if (!PyType_Check(self)) { if (!PyType_Check(self)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"descriptor '%V' requires a type " "descriptor '%V' requires a type "
"but received a '%.100s'", "but received a '%.100s' instance",
descr_name((PyDescrObject *)descr), "?", descr_name((PyDescrObject *)descr), "?",
PyDescr_TYPE(descr)->tp_name,
self->ob_type->tp_name); self->ob_type->tp_name);
return NULL; return NULL;
} }
if (!PyType_IsSubtype((PyTypeObject *)self, PyDescr_TYPE(descr))) { if (!PyType_IsSubtype((PyTypeObject *)self, PyDescr_TYPE(descr))) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"descriptor '%V' " "descriptor '%V' requires a subtype of '%.100s' "
"requires a subtype of '%.100s' " "but received '%.100s'",
"but received '%.100s",
descr_name((PyDescrObject *)descr), "?", descr_name((PyDescrObject *)descr), "?",
PyDescr_TYPE(descr)->tp_name, PyDescr_TYPE(descr)->tp_name,
self->ob_type->tp_name); ((PyTypeObject*)self)->tp_name);
return NULL; return NULL;
} }