Skip to content

[3.7] bpo-36433: fix confusing error messages in classmethoddescr_call (GH-12556) #12557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Mar 26, 2019
Merged

[3.7] bpo-36433: fix confusing error messages in classmethoddescr_call (GH-12556) #12557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions Lib/test/test_descr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1592,12 +1592,27 @@ class SubSpam(spam.spamlist): pass
self.assertEqual(x2, SubSpam)
self.assertEqual(a2, a1)
self.assertEqual(d2, d1)
with self.assertRaises(TypeError):

with self.assertRaises(TypeError) as 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())
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)
self.assertEqual(
str(cm.exception),
"descriptor 'classmeth' requires a subtype of 'xxsubtype.spamlist' "
"but received 'list'")

def test_staticmethods(self):
# Testing static methods...
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2019-03-26-17-23-02.bpo-36433.-8XzZf.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed TypeError message in classmethoddescr_call.
10 changes: 4 additions & 6 deletions Objects/descrobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,20 +313,18 @@ classmethoddescr_call(PyMethodDescrObject *descr, PyObject *args,
if (!PyType_Check(self)) {
PyErr_Format(PyExc_TypeError,
"descriptor '%V' requires a type "
"but received a '%.100s'",
"but received a '%.100s' instance",
descr_name((PyDescrObject *)descr), "?",
PyDescr_TYPE(descr)->tp_name,
self->ob_type->tp_name);
return NULL;
}
if (!PyType_IsSubtype((PyTypeObject *)self, PyDescr_TYPE(descr))) {
PyErr_Format(PyExc_TypeError,
"descriptor '%V' "
"requires a subtype of '%.100s' "
"but received '%.100s",
"descriptor '%V' requires a subtype of '%.100s' "
"but received '%.100s'",
descr_name((PyDescrObject *)descr), "?",
PyDescr_TYPE(descr)->tp_name,
self->ob_type->tp_name);
((PyTypeObject*)self)->tp_name);
return NULL;
}

Expand Down