mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Replace BadInternalCall with TypeError. Add a test case. Fix whitespace.
Just van Rossum showed a weird, but clever way for pure python code to trigger the BadInternalCall. The C code had assumed that calling a class constructor would return an instance of that class; however, classes that abuse __new__ can invalidate that assumption.
This commit is contained in:
parent
21d77f5e9c
commit
b02bb5ed0a
2 changed files with 10 additions and 2 deletions
|
@ -973,15 +973,16 @@ dict_fromkeys(PyObject *mp, PyObject *args)
|
|||
PyObject *cls;
|
||||
int status;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "OO|O:fromkeys", &cls, &seq, &value))
|
||||
if (!PyArg_ParseTuple(args, "OO|O:fromkeys", &cls, &seq, &value))
|
||||
return NULL;
|
||||
|
||||
d = PyObject_CallObject(cls, NULL);
|
||||
if (d == NULL)
|
||||
return NULL;
|
||||
if (!PyDict_Check(d)) {
|
||||
PyErr_BadInternalCall();
|
||||
Py_DECREF(d);
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"class constructor must return a subclass of dict");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue