Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-06-16 03:05:53 -04:00
commit 4a518f02e2
2 changed files with 3 additions and 2 deletions

View file

@ -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 *