diff options
| author | Georg Brandl <georg@python.org> | 2009-05-26 07:50:52 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-05-26 07:50:52 (GMT) |
| commit | bbc5cc1e1dee1cea2772c182c9f122d031a20825 (patch) | |
| tree | 327e1612ed1577ad3d7fe3c23bb2b59e9fc4a1d8 | |
| parent | e9a651476760fea6dfa12b9621ce57f015823b69 (diff) | |
| download | cpython-bbc5cc1e1dee1cea2772c182c9f122d031a20825.zip cpython-bbc5cc1e1dee1cea2772c182c9f122d031a20825.tar.gz cpython-bbc5cc1e1dee1cea2772c182c9f122d031a20825.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.rst | 2 | ||||
| -rw-r--r-- | Lib/sched.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/sched.rst b/Doc/library/sched.rst index 2283077..51b9d3f 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 aecdb2a..f0da829 100644 --- a/Lib/sched.py +++ b/Lib/sched.py @@ -67,7 +67,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) |