Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-31 04:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

GH-103899: Provide a hint when accidentally calling a module (GH-103900)

Browse source
This commit is contained in:
Brandt Bucher 2023-05-04 15:07:42 -07:00 • committed by GitHub
parent f5c38382f9
commit 7d35c3121a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Objects/call.c
View file

@ -157,6 +157,42 @@ PyObject_VectorcallDict(PyObject *callable, PyObject *const *args,
return _PyObject_FastCallDictTstate(tstate, callable, args, nargsf, kwargs);
}
static void
object_is_not_callable(PyThreadState *tstate, PyObject *callable)
{
if (Py_IS_TYPE(callable, &PyModule_Type)) {
// >>> import pprint
// >>> pprint(thing)
// Traceback (most recent call last):
// File "<stdin>", line 1, in <module>
// TypeError: 'module' object is not callable. Did you mean: 'pprint.pprint(...)'?
PyObject *name = PyModule_GetNameObject(callable);
if (name == NULL) {
_PyErr_Clear(tstate);
goto basic_type_error;
}
PyObject *attr;
int res = _PyObject_LookupAttr(callable, name, &attr);
if (res < 0) {
_PyErr_Clear(tstate);
}
else if (res > 0 && PyCallable_Check(attr)) {
_PyErr_Format(tstate, PyExc_TypeError,
"'%.200s' object is not callable. "
"Did you mean: '%U.%U(...)'?",
Py_TYPE(callable)->tp_name, name, name);
Py_DECREF(attr);
Py_DECREF(name);
return;
}
Py_XDECREF(attr);
Py_DECREF(name);
}
basic_type_error:
_PyErr_Format(tstate, PyExc_TypeError, "'%.200s' object is not callable",
Py_TYPE(callable)->tp_name);
}
PyObject *
_PyObject_MakeTpCall(PyThreadState *tstate, PyObject *callable,
@ -171,9 +207,7 @@ _PyObject_MakeTpCall(PyThreadState *tstate, PyObject *callable,
* temporary dictionary for keyword arguments (if any) */
ternaryfunc call = Py_TYPE(callable)->tp_call;
if (call == NULL) {
_PyErr_Format(tstate, PyExc_TypeError,
"'%.200s' object is not callable",
Py_TYPE(callable)->tp_name);
object_is_not_callable(tstate, callable);
return NULL;
}
@ -322,9 +356,7 @@ _PyObject_Call(PyThreadState *tstate, PyObject *callable,
else {
call = Py_TYPE(callable)->tp_call;
if (call == NULL) {
_PyErr_Format(tstate, PyExc_TypeError,
"'%.200s' object is not callable",
Py_TYPE(callable)->tp_name);
object_is_not_callable(tstate, callable);
return NULL;
}