Changeset 3665

Timestamp:

17/11/08 00:42:38 (8 weeks ago)

Author:

tack

Message:

Fix a bug with InProgressAny?(…).wait(); add pass_index kwarg to
InProgressAny?.

Files:

• trunk/base/src/notifier/async.py (modified) (4 diffs)

trunk/base/src/notifier/async.py

@@ -469 +469 @@
         import main
         from thread import is_mainthread
+
+        # Connect a dummy handler to ourselves.  This is a bit kludgy, but
+        # solves a particular problem with InProgress(Any|All), which don't
+        # actually finish unless something wants to know.  Normally, without
+        # wait, we are yielded to the coroutine wrapper which implicitly
+        # connects to us.  Here, with wait(), in a sense we want to know when
+        # self finishes.
+        dummy = lambda *args, **kwargs: None
+        self.connect(dummy)
+
         if is_mainthread():
             # We're waiting in the main thread, so we must keep the mainloop
@@ -486 +496 @@
 
         if not self.is_finished():
+            self.disconnect(dummy)
             raise TimeoutException
 
@@ -565 +576 @@
     building state machines using coroutines.
 
-    The InProgressAny object then finishes with a 2-tuple, whose first
-    element is the index (offset from 0) of the InProgress that finished,
-    and the second element is the result the InProgress was finished with.
-    """
-    def __init__(self, *objects):
+    If pass_index is True, the InProgressAny object then finishes with a
+    2-tuple, whose first element is the index (offset from 0) of the InProgress
+    that finished, and the second element is the result the InProgress was
+    finished with.
+    
+    If pass_index is False, the InProgressAny is finished with just the result
+    and not the index.
+    """
+    def __init__(self, *objects, **kwargs):
         super(InProgressAny, self).__init__()
+        self._pass_index = kwargs.get('pass_index', True)
         # Generate InProgress objects for anything that was passed.
         self._objects = [ inprogress(o) for o in objects ]
@@ -630 +646 @@
         constructor have finished.
         """
-        super(InProgressAny, self).finish((result, args))
+        if self._pass_index:
+            data = (result, args)
+        else:
+            data = args
+        super(InProgressAny, self).finish(data)
+
         # We're done with the underlying IP objects so unref them.  In the
         # case of InProgressCallbacks connected weakly to signals (which