Permalink
Browse files

small bugs

  • Loading branch information...
1 parent 46d7c9d commit e5447b02f2fe15502009320aee497a58f814cb37 @minrk minrk committed Feb 22, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 IPython/zmq/parallel/scheduler.py
  2. +1 −1 IPython/zmq/parallel/view.py
@@ -225,7 +225,7 @@ def handle_stranded_tasks(self, engine):
"""Deal with jobs resident in an engine that died."""
lost = self.pending.pop(engine)
- for msg_id, (raw_msg,follow) in lost.iteritems():
+ for msg_id, (raw_msg, targets, MET, follow, timeout) in lost.iteritems():
self.all_failed.add(msg_id)
self.all_done.add(msg_id)
idents,msg = self.session.feed_identities(raw_msg, copy=False)
@@ -266,7 +266,7 @@ class DirectView(View):
@save_ids
def execute(self, code, block=True):
"""execute some code on my targets."""
- return self.client.execute(code, block=self.block, targets=self.targets)
+ return self.client.execute(code, block=block, targets=self.targets)
def update(self, ns):
"""update remote namespace with dict `ns`"""

0 comments on commit e5447b0

Please sign in to comment.