summaryrefslogtreecommitdiff
path: root/Python/bltinmodule.c
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-02-15 23:38:05 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2013-02-15 23:38:05 +0200
commit82a7bb74823d6adf3f74014060944d475eaa4643 (patch)
treebfe633862698b9ea2fd9f8774f5f4d44ef9a642d /Python/bltinmodule.c
parent615c488b4ba9ff42e1d9a0872cb4370bdd739247 (diff)
parent6b8e2d5d7b82000f170f6301f25773f12172d456 (diff)
downloadcpython-82a7bb74823d6adf3f74014060944d475eaa4643.tar.gz
#17178: merge with 3.2.
Diffstat (limited to 'Python/bltinmodule.c')
-rw-r--r--Python/bltinmodule.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 0e6e6ff9ff..bf90aba3a2 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)