diff options
| author | Raymond Hettinger <python@rcn.com> | 2009-08-04 19:08:05 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2009-08-04 19:08:05 (GMT) |
| commit | 8fdab9526070362a02eb12f84ecc601e3182bbc2 (patch) | |
| tree | 3b7eba20a49378b2aaf36831c25ba9b13f4dfb60 /Modules/_collectionsmodule.c | |
| parent | 6c0f337904c1a6414fbaee84f7923cc0877e47eb (diff) | |
| download | cpython-8fdab9526070362a02eb12f84ecc601e3182bbc2.zip cpython-8fdab9526070362a02eb12f84ecc601e3182bbc2.tar.gz cpython-8fdab9526070362a02eb12f84ecc601e3182bbc2.tar.bz2 | |
Issue 6637: defaultdict.copy() failed with an empty factory.
Diffstat (limited to 'Modules/_collectionsmodule.c')
| -rw-r--r-- | Modules/_collectionsmodule.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index a4fdf76..1873cab 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1228,6 +1228,9 @@ defdict_copy(defdictobject *dd) whose class constructor has the same signature. Subclasses that define a different constructor signature must override copy(). */ + + if (dd->default_factory == NULL) + return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL); return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), dd->default_factory, dd, NULL); } @@ -1391,7 +1394,7 @@ defdict_init(PyObject *self, PyObject *args, PyObject *kwds) Py_ssize_t n = PyTuple_GET_SIZE(args); if (n > 0) { newdefault = PyTuple_GET_ITEM(args, 0); - if (!PyCallable_Check(newdefault)) { + if (!PyCallable_Check(newdefault) && newdefault != Py_None) { PyErr_SetString(PyExc_TypeError, "first argument must be callable"); return -1; |