[Python-checkins] cpython (merge 3.4 -> 3.5): merge

[raymond.hettinger]

https://hg.python.org/cpython/rev/1e0867706c99
changeset:   96957:1e0867706c99
branch:      3.5
parent:      96949:361d7af9396e
parent:      96956:efda1eaf86a3
user:        Raymond Hettinger <python at rcn.com>
date:        Mon Jul 20 03:10:48 2015 -0400
summary:
  merge

files:
  Modules/_collectionsmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -2023,7 +2023,7 @@
             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;
             }
         }

-- 
Repository URL: https://hg.python.org/cpython