[Python-checkins] cpython (merge 3.3 -> default): #17178: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/168efd87e051
changeset:   82218:168efd87e051
parent:      82214:8b85f10b5341
parent:      82217:34cfe145b286
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Feb 15 23:38:23 2013 +0200
summary:
  #17178: merge with 3.3.

files:
  Misc/ACKS            |  1 +
  Python/bltinmodule.c |  6 ++++--
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -41,6 +41,7 @@
 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
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -263,7 +263,8 @@
 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 @@
 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)

-- 
Repository URL: http://hg.python.org/cpython