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.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index eca8677..d3603f0 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -973,15 +973,16 @@
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;
}