Skip to content

Commit 293ab97

Browse files
committed
#17178: merge with 3.2.
2 parents db0b7be + b19ed57 commit 293ab97

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Misc/ACKS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Oliver Andrich
4141
Ross Andrus
4242
Juancarlo Añez
4343
Jérémy Anger
44+
Ankur Ankan
4445
Jon Anglin
4546
Heidi Annexstad
4647
Éric Araujo

Python/bltinmodule.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ builtin_all(PyObject *self, PyObject *v)
263263
PyDoc_STRVAR(all_doc,
264264
"all(iterable) -> bool\n\
265265
\n\
266-
Return True if bool(x) is True for all values x in the iterable.");
266+
Return True if bool(x) is True for all values x in the iterable.\n\
267+
If the iterable is empty, return True.");
267268

268269
static PyObject *
269270
builtin_any(PyObject *self, PyObject *v)
@@ -305,7 +306,8 @@ builtin_any(PyObject *self, PyObject *v)
305306
PyDoc_STRVAR(any_doc,
306307
"any(iterable) -> bool\n\
307308
\n\
308-
Return True if bool(x) is True for any x in the iterable.");
309+
Return True if bool(x) is True for any x in the iterable.\n\
310+
If the iterable is empty, return False.");
309311

310312
static PyObject *
311313
builtin_ascii(PyObject *self, PyObject *v)

0 commit comments

Comments
 (0)