summaryrefslogtreecommitdiffstats
path: root/Modules/_collectionsmodule.c
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2015-07-20 07:11:16 (GMT)
committerRaymond Hettinger <python@rcn.com>2015-07-20 07:11:16 (GMT)
commitaa23fa2e21677c21f5727e6c2602a8bbf67d7fe4 (patch)
treeb061d9b50efae323b1c6b58d06c56d8668e22a85 /Modules/_collectionsmodule.c
parent482c05cbb5506a5332e435ffdd2c32ae62e7b9a1 (diff)
parent043e8008603b168812bb6973f870fdd2132304b7 (diff)
downloadcpython-aa23fa2e21677c21f5727e6c2602a8bbf67d7fe4.zip
cpython-aa23fa2e21677c21f5727e6c2602a8bbf67d7fe4.tar.gz
cpython-aa23fa2e21677c21f5727e6c2602a8bbf67d7fe4.tar.bz2
merge
Diffstat (limited to 'Modules/_collectionsmodule.c')
-rw-r--r--Modules/_collectionsmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 47db46f..d2c0448 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -2023,7 +2023,7 @@ defdict_init(PyObject *self, PyObject *args, PyObject *kwds)
newdefault = PyTuple_GET_ITEM(args, 0);
if (!PyCallable_Check(newdefault) && newdefault != Py_None) {
PyErr_SetString(PyExc_TypeError,
- "first argument must be callable");
+ "first argument must be callable or None");
return -1;
}
}