[Python-checkins] r72933 - in python/branches/release26-maint: Doc/library/sched.rst Lib/sched.py

Tue May 26 09:50:52 CEST 2009

Author: georg.brandl
Date: Tue May 26 09:50:52 2009
New Revision: 72933
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/release26-maint/ (props changed)
 python/branches/release26-maint/Doc/library/sched.rst
 python/branches/release26-maint/Lib/sched.py
Modified: python/branches/release26-maint/Doc/library/sched.rst
==============================================================================

--- python/branches/release26-maint/Doc/library/sched.rst	(original)
+++ python/branches/release26-maint/Doc/library/sched.rst	Tue May 26 09:50:52 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/release26-maint/Lib/sched.py
==============================================================================
--- python/branches/release26-maint/Lib/sched.py	(original)
+++ python/branches/release26-maint/Lib/sched.py	Tue May 26 09:50:52 2009
@@ -67,7 +67,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)
