Skip to content

Loading…

Fixes for parallel code on Python 3 #985

Merged
merged 1 commit into from

2 participants

@takluyver
IPython member

Just a couple of minor fixes. Annoyingly, the parallel test suite now hangs (before it just failed) - but doing a basic example using ipcluster3 worked.

@minrk
IPython member

This seems just fine, go for it. I can dig into real bugs in the test suite later.

@takluyver
IPython member

Great, thanks.

@takluyver takluyver merged commit a5245d0 into ipython:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 9, 2011
  1. @takluyver
Showing with 2 additions and 2 deletions.
  1. +1 −1 IPython/parallel/apps/ipcontrollerapp.py
  2. +1 −1 IPython/utils/traitlets.py
View
2 IPython/parallel/apps/ipcontrollerapp.py
@@ -273,7 +273,7 @@ def init_hub(self):
if not self.reuse_files:
# save to new json config files
f = self.factory
- cdict = {'exec_key' : f.session.key,
+ cdict = {'exec_key' : f.session.key.decode('ascii'),
'ssh' : self.ssh_server,
'url' : "%s://%s:%s"%(f.client_transport, f.client_ip, f.regport),
'location' : self.location
View
2 IPython/utils/traitlets.py
@@ -961,7 +961,7 @@ def validate (self, obj, value):
class Bytes(TraitType):
"""A trait for byte strings."""
- default_value = ''
+ default_value = b''
info_text = 'a string'
def validate(self, obj, value):
Something went wrong with that request. Please try again.