[Python-checkins] r72934 - in python/branches/py3k: Doc/library/sched.rst Lib/sched.py

[georg.brandl]

Author: georg.brandl
Date: Tue May 26 09:51:03 2009
New Revision: 72934

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/sched.rst
   python/branches/py3k/Lib/sched.py

Modified: python/branches/py3k/Doc/library/sched.rst
==============================================================================
--- python/branches/py3k/Doc/library/sched.rst	(original)
+++ python/branches/py3k/Doc/library/sched.rst	Tue May 26 09:51:03 2009
@@ -100,7 +100,7 @@
 .. 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()

Modified: python/branches/py3k/Lib/sched.py
==============================================================================
--- python/branches/py3k/Lib/sched.py	(original)
+++ python/branches/py3k/Lib/sched.py	Tue May 26 09:51:03 2009
@@ -73,7 +73,7 @@
         """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)