diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-06-16 07:05:53 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-06-16 07:05:53 (GMT) |
| commit | 4a518f02e254c977f9417a6a6eff3540dcf438ef (patch) | |
| tree | 33bc0b85a7cffe44ae63b6081aadadc5f43a1614 | |
| parent | 9bec397df9ef8c227e42760a749905cae0e94ebf (diff) | |
| parent | f2fb73f6757d569d176811e849a2732861ec6eb9 (diff) | |
| download | cpython-4a518f02e254c977f9417a6a6eff3540dcf438ef.zip cpython-4a518f02e254c977f9417a6a6eff3540dcf438ef.tar.gz cpython-4a518f02e254c977f9417a6a6eff3540dcf438ef.tar.bz2 | |
Merge with 3.4
| -rw-r--r-- | Doc/library/functions.rst | 3 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 2 |
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 * |