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.
........

diff --git a/Doc/library/sched.rst b/Doc/library/sched.rst
index f93c9b5ace420bf50ae3b1b49446269dc7c044c4..0290ec41cdfad42f319719e6be38b45f51a2fa03 100644 (file)
--- 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 11bb0a3a1861526d5e055e5f565529d86f804efe..f6a699c916256b4cddd441db2af3552677c113ad 100644 (file)
--- 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)