From: Giampaolo Rodola' <g.rodola@gmail.com> Date: Tue, 22 Nov 2011 23:03:15 +0000 (+0100) Subject: revert cset 6a0da9b65e54 against sched.py committed by accident X-Git-Tag: v3.3.0a1~742^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8cf4dfa2f2957c7bb7396f287fa3bcf8c9ddd24;p=python revert cset 6a0da9b65e54 against sched.py committed by accident --- diff --git a/Lib/sched.py b/Lib/sched.py index 3e41198c10..6c01e6968a 100644 --- a/Lib/sched.py +++ b/Lib/sched.py @@ -35,9 +35,6 @@ from collections import namedtuple __all__ = ["scheduler"] class Event(namedtuple('Event', 'time, priority, action, argument, kwargs')): - def __init__(self, *args, **kwargs): - super(Event, self).__init__(*args, **kwargs) - self._scheduled = False def __eq__(s, o): return (s.time, s.priority) == (o.time, o.priority) def __ne__(s, o): return (s.time, s.priority) != (o.time, o.priority) def __lt__(s, o): return (s.time, s.priority) < (o.time, o.priority) @@ -62,7 +59,6 @@ class scheduler: """ event = Event(time, priority, action, argument, kwargs) - event._scheduled = True heapq.heappush(self._queue, event) return event # The ID @@ -85,9 +81,6 @@ class scheduler: self._queue.remove(event) heapq.heapify(self._queue) - def is_scheduled(self, event): - return event._scheduled - def empty(self): """Check whether the queue is empty.""" return not self._queue @@ -129,7 +122,6 @@ class scheduler: # Verify that the event was not removed or altered # by another thread after we last looked at q[0]. if event is checked_event: - event._scheduled = False action(*argument, **kwargs) delayfunc(0) # Let other threads run else: