Preliminary fix to timer.cancel(). Right fix may be to change

__cmp__() method and use an explicit sort key, but this works.

svn path=/rpkid/rpki/async.py; revision=3267

1 files changed, 3 insertions, 4 deletions

diff --git a/rpkid/rpki/async.py b/rpkid/rpki/async.py
index fc6ba663..faf8e991 100644
--- a/rpkid/rpki/async.py
+++ b/rpkid/rpki/async.py
@@ -152,10 +152,9 @@ class timer(object):
     """
     if self.gc_debug:
       self.trace("Canceling %r" % self)
-    try:
-      self.queue.remove(self)
-    except ValueError:
-      pass
+    for i in xrange(len(self.queue) - 1, -1, -1):
+      if self.queue[i] is self:
+        del self.queue[i]
 
   def is_set(self):
     """Test whether this timer is currently set."""