[py-svn] r35765 - py/dist/py/test/rsession

[fijal at codespeak.net]

Author: fijal
Date: Thu Dec 14 22:15:48 2006
New Revision: 35765

Modified:
   py/dist/py/test/rsession/master.py
Log:
didn't mean to check that in.


Modified: py/dist/py/test/rsession/master.py
==============================================================================
--- py/dist/py/test/rsession/master.py	(original)
+++ py/dist/py/test/rsession/master.py	Thu Dec 14 22:15:48 2006
@@ -34,24 +34,20 @@
     from py.__.test.rsession.rsession import session_options
     
     max_tasks_per_node = session_options.max_tasks_per_node
-    try:
-        while 1:
-            try:
-                for node in masternodes:
-                    if len(node.pending) < max_tasks_per_node:
-                        item = itemgenerator.next()
-                        if shouldstop():
-                            for _node in masternodes:
-                                _node.send(StopIteration) # magic connector
-                            return
-                        node.send(item)
-            except StopIteration:
-                break
-            waiter()
-    except (KeyboardInterrupt, SystemExit):
-        for _node in masternodes:
-            _node.send(StopIteration)
-        raise
+    while 1:
+        try:
+            for node in masternodes:
+                if len(node.pending) < max_tasks_per_node:
+                    item = itemgenerator.next()
+                    if shouldstop():
+                        for _node in masternodes:
+                            _node.send(StopIteration) # magic connector
+                        return
+                    node.send(item)
+        except StopIteration:
+            break
+        waiter()
+
 
 def setup_slave(gateway, pkgpath, options):
     from py.__.test.rsession import slave