merge 3.4

This commit is contained in:
Benjamin Peterson 2014-04-18 01:04:07 -04:00
commit e83236f396

View file

@ -1325,7 +1325,7 @@ builtin_len(PyObject *self, PyObject *v)
} }
PyDoc_STRVAR(len_doc, PyDoc_STRVAR(len_doc,
"len(module, object)\n\ "len(object)\n\
\n\ \n\
Return the number of items of a sequence or mapping."); Return the number of items of a sequence or mapping.");