summaryrefslogtreecommitdiffstats
path: root/Objects/dictobject.c
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2002-12-09 22:56:13 (GMT)
committerTim Peters <tim.peters@gmail.com>2002-12-09 22:56:13 (GMT)
commitbca1cbc6f895c7f9f003877b1cfc0c649387ae1c (patch)
treedff6bc8f6b8f2c8eab0a06e4921d7e6521f0a396 /Objects/dictobject.c
parentc7e3c5e3062295d4c3a7d8a41e4c2246e7476194 (diff)
downloadcpython-bca1cbc6f895c7f9f003877b1cfc0c649387ae1c.zip
cpython-bca1cbc6f895c7f9f003877b1cfc0c649387ae1c.tar.gz
cpython-bca1cbc6f895c7f9f003877b1cfc0c649387ae1c.tar.bz2
SF 548651: Fix the METH_CLASS implementation.
Most of these patches are from Thomas Heller, with long lines folded by Tim. The change to test_descr.py is from Guido. See the bug report. Not a bugfix candidate -- METH_CLASS is new in 2.3.
Diffstat (limited to 'Objects/dictobject.c')
-rw-r--r--Objects/dictobject.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 69adc50..712ec2c 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -963,17 +963,16 @@ dict_items(register dictobject *mp)
}
static PyObject *
-dict_fromkeys(PyObject *mp, PyObject *args)
+dict_fromkeys(PyObject *cls, PyObject *args)
{
PyObject *seq;
PyObject *value = Py_None;
PyObject *it; /* iter(seq) */
PyObject *key;
PyObject *d;
- PyObject *cls;
int status;
- if (!PyArg_ParseTuple(args, "OO|O:fromkeys", &cls, &seq, &value))
+ if (!PyArg_ParseTuple(args, "O|O:fromkeys", &seq, &value))
return NULL;
d = PyObject_CallObject(cls, NULL);