summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-05-26 07:51:03 (GMT)
committerGeorg Brandl <georg@python.org>2009-05-26 07:51:03 (GMT)
commitc38a0002bca5424a1ec3cbc68af4ee8727ba2302 (patch)
tree96824fabe951ed14d13b9f87957c49d329d14838
parent98b52ef7de343713a5c60612ad0a7768156836e6 (diff)
downloadcpython-c38a0002bca5424a1ec3cbc68af4ee8727ba2302.zip
cpython-c38a0002bca5424a1ec3cbc68af4ee8727ba2302.tar.gz
cpython-c38a0002bca5424a1ec3cbc68af4ee8727ba2302.tar.bz2
Merged revisions 72932 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72932 | georg.brandl | 2009-05-26 09:50:23 +0200 (Di, 26 Mai 2009) | 1 line #6112: list.remove raises ValueError, not RuntimeError. ........
-rw-r--r--Doc/library/sched.rst2
-rw-r--r--Lib/sched.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/sched.rst b/Doc/library/sched.rst
index f93c9b5..0290ec4 100644
--- a/Doc/library/sched.rst
+++ b/Doc/library/sched.rst
@@ -100,7 +100,7 @@ Scheduler Objects
.. method:: scheduler.cancel(event)
Remove the event from the queue. If *event* is not an event currently in the
- queue, this method will raise a :exc:`RuntimeError`.
+ queue, this method will raise a :exc:`ValueError`.
.. method:: scheduler.empty()
diff --git a/Lib/sched.py b/Lib/sched.py
index 11bb0a3..f6a699c 100644
--- a/Lib/sched.py
+++ b/Lib/sched.py
@@ -73,7 +73,7 @@ class scheduler:
"""Remove an event from the queue.
This must be presented the ID as returned by enter().
- If the event is not in the queue, this raises RuntimeError.
+ If the event is not in the queue, this raises ValueError.
"""
self._queue.remove(event)