summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-06-16 07:05:53 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-06-16 07:05:53 (GMT)
commit4a518f02e254c977f9417a6a6eff3540dcf438ef (patch)
tree33bc0b85a7cffe44ae63b6081aadadc5f43a1614 /Python
parent9bec397df9ef8c227e42760a749905cae0e94ebf (diff)
parentf2fb73f6757d569d176811e849a2732861ec6eb9 (diff)
downloadcpython-4a518f02e254c977f9417a6a6eff3540dcf438ef.zip
cpython-4a518f02e254c977f9417a6a6eff3540dcf438ef.tar.gz
cpython-4a518f02e254c977f9417a6a6eff3540dcf438ef.tar.bz2
Merge with 3.4
Diffstat (limited to 'Python')
-rw-r--r--Python/bltinmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index d351cd0..a81af65 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1327,7 +1327,7 @@ builtin_len(PyObject *self, PyObject *v)
PyDoc_STRVAR(len_doc,
"len(object)\n\
\n\
-Return the number of items of a sequence or mapping.");
+Return the number of items of a sequence or collection.");
static PyObject *