summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-06-16 07:05:37 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-06-16 07:05:37 (GMT)
commitf2fb73f6757d569d176811e849a2732861ec6eb9 (patch)
treebf8cac643ebfdf6225a83eee5e06dc9820be8244
parentd0c1ea42f76e19dc3d04238c29cdd14a7ce39899 (diff)
downloadcpython-f2fb73f6757d569d176811e849a2732861ec6eb9.zip
cpython-f2fb73f6757d569d176811e849a2732861ec6eb9.tar.gz
cpython-f2fb73f6757d569d176811e849a2732861ec6eb9.tar.bz2
Issue #19362: Tweek len() doc and docstring to expand the indicated range of
arguments. Original patch by Gareth Rees.
-rw-r--r--Doc/library/functions.rst3
-rw-r--r--Python/bltinmodule.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 02e6374..ea489ac 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -742,7 +742,8 @@ are always available. They are listed here in alphabetical order.
.. function:: len(s)
Return the length (the number of items) of an object. The argument may be a
- sequence (string, tuple or list) or a mapping (dictionary).
+ sequence (such as a string, bytes, tuple, list, or range) or a collection
+ (such as a dictionary, set, or frozen set).
.. _func-list:
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 *