Merged revisions 71607,71653,71696,71771,71786 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71607 | benjamin.peterson | 2009-04-14 23:23:09 +0200 (Di, 14 Apr 2009) | 1 line
tupel -> tuple
........
r71653 | raymond.hettinger | 2009-04-16 20:16:10 +0200 (Do, 16 Apr 2009) | 1 line
Clarify the behavior of any() and all() with an empty iterable.
........
r71696 | georg.brandl | 2009-04-18 10:26:21 +0200 (Sa, 18 Apr 2009) | 1 line
"not subscriptable" should be a bit more understandable than "unsubscriptable".
........
r71771 | raymond.hettinger | 2009-04-20 20:23:57 +0200 (Mo, 20 Apr 2009) | 1 line
Fix typo
........
r71786 | georg.brandl | 2009-04-21 20:23:08 +0200 (Di, 21 Apr 2009) | 1 line
#5757: fix copy-paste error in notify().
........
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index c79a8c4..5ea0489 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -17,7 +17,8 @@
.. function:: all(iterable)
- Return True if all elements of the *iterable* are true. Equivalent to::
+ Return True if all elements of the *iterable* are true (or if the iterable
+ is empty). Equivalent to::
def all(iterable):
for element in iterable:
@@ -28,7 +29,8 @@
.. function:: any(iterable)
- Return True if any element of the *iterable* is true. Equivalent to::
+ Return True if any element of the *iterable* is true. If the iterable
+ is empty, return False. Equivalent to::
def any(iterable):
for element in iterable:
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 2b66461..d880157 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -537,12 +537,12 @@
.. method:: Condition.notify()
- Wake up a thread waiting on this condition, if any. Wait until notified or until
- a timeout occurs. If the calling thread has not acquired the lock when this
- method is called, a :exc:`RuntimeError` is raised.
+ Wake up a thread waiting on this condition, if any. If the calling thread
+ has not acquired the lock when this method is called, a :exc:`RuntimeError`
+ is raised.
- This method wakes up one of the threads waiting for the condition variable, if
- any are waiting; it is a no-op if no threads are waiting.
+ This method wakes up one of the threads waiting for the condition variable,
+ if any are waiting; it is a no-op if no threads are waiting.
The current implementation wakes up exactly one thread, if any are waiting.
However, it's not safe to rely on this behavior. A future, optimized
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 2236286..51490c4 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1220,9 +1220,9 @@
.. function:: screensize(canvwidth=None, canvheight=None, bg=None)
- :param canvwidth: positive integer, new width of canvas in pixels
- :param canvheight: positive integer, new height of canvas in pixels
- :param bg: colorstring or color-tupel, new background color
+ :param canvwidth: positive integer, new width of canvas in pixels :param
+ canvheight: positive integer, new height of canvas in pixels :param bg:
+ colorstring or color-tuple, new background color
If no arguments are given, return current (canvaswidth, canvasheight). Else
resize the canvas the turtles are drawing on. Do not alter the drawing
diff --git a/Objects/abstract.c b/Objects/abstract.c
index a4d3964..7679d5b 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -135,7 +135,7 @@
"be integer, not '%.200s'", key);
}
- return type_error("'%.200s' object is unsubscriptable", o);
+ return type_error("'%.200s' object is not subscriptable", o);
}
int