summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-02-15 21:38:23 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-02-15 21:38:23 (GMT)
commit178e6fef9e8f6248dcc77022d0f448b33698ad8f (patch)
tree259f3b30a389e2c0273258b9fa2468a81cc9b906 /Python
parenta7b814973f8a3bae62aaec5cde358f175190994d (diff)
parent293ab9728aafc86e33b268049ce598dccf56ff51 (diff)
downloadcpython-178e6fef9e8f6248dcc77022d0f448b33698ad8f.zip
cpython-178e6fef9e8f6248dcc77022d0f448b33698ad8f.tar.gz
cpython-178e6fef9e8f6248dcc77022d0f448b33698ad8f.tar.bz2
#17178: merge with 3.3.
Diffstat (limited to 'Python')
-rw-r--r--Python/bltinmodule.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 6f52a9a..f794d41 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)