diff options
author | Raymond Hettinger <python@rcn.com> | 2015-07-20 07:10:48 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2015-07-20 07:10:48 (GMT) |
commit | 043e8008603b168812bb6973f870fdd2132304b7 (patch) | |
tree | 49b779471c7acf05a05725be683ad484f0490d78 /Modules | |
parent | 485407ce1e4dc3b2005bc1c72ce6020c28f90030 (diff) | |
parent | 239aba7874d83eee798b19fe3fc11880516fb356 (diff) | |
download | cpython-043e8008603b168812bb6973f870fdd2132304b7.zip cpython-043e8008603b168812bb6973f870fdd2132304b7.tar.gz cpython-043e8008603b168812bb6973f870fdd2132304b7.tar.bz2 |
merge
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_collectionsmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index c1fd8b9..830c5b8 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; } } |