#17178: merge with 3.2.

This commit is contained in:
Ezio Melotti 2013-02-15 23:38:05 +02:00
commit 293ab9728a
2 changed files with 5 additions and 2 deletions

View File

@ -41,6 +41,7 @@ Oliver Andrich
Ross Andrus
Juancarlo Añez
Jérémy Anger
Ankur Ankan
Jon Anglin
Heidi Annexstad
Éric Araujo

View File

@ -263,7 +263,8 @@ builtin_all(PyObject *self, PyObject *v)
PyDoc_STRVAR(all_doc,
"all(iterable) -> bool\n\
\n\
Return True if bool(x) is True for all values x in the iterable.");
Return True if bool(x) is True for all values x in the iterable.\n\
If the iterable is empty, return True.");
static PyObject *
builtin_any(PyObject *self, PyObject *v)
@ -305,7 +306,8 @@ builtin_any(PyObject *self, PyObject *v)
PyDoc_STRVAR(any_doc,
"any(iterable) -> bool\n\
\n\
Return True if bool(x) is True for any x in the iterable.");
Return True if bool(x) is True for any x in the iterable.\n\
If the iterable is empty, return False.");
static PyObject *
builtin_ascii(PyObject *self, PyObject *v)