#17178: merge with 3.3.

2 files changed, 5 insertions, 2 deletions

diff --git a/Misc/ACKS b/Misc/ACKS
index 560e8d6500..e9f0205fde 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -41,6 +41,7 @@ Oliver Andrich
 Ross Andrus
 Juancarlo Añez
 Jérémy Anger
+Ankur Ankan
 Jon Anglin
 Heidi Annexstad
 Éric Araujo
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 6f52a9a8cf..f794d410c9 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -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)