[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[terry.reedy]

http://hg.python.org/cpython/rev/56fbb15565e2
changeset:   91205:56fbb15565e2
parent:      91202:7e268ae424a4
parent:      91204:8fcbe41e1242
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Mon Jun 16 03:05:53 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/library/functions.rst |  3 ++-
  Python/bltinmodule.c      |  2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -742,7 +742,8 @@
 .. 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
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1327,7 +1327,7 @@
 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 *

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