Skip to content
This repository

Fixes for parallel code on Python 3 #985

Merged
merged 1 commit into from over 2 years ago

2 participants

Thomas Kluyver Min RK
Thomas Kluyver
Collaborator

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.

Min RK
Owner

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

Thomas Kluyver
Collaborator

Great, thanks.

Thomas Kluyver takluyver merged commit a5245d0 into from November 09, 2011
Thomas Kluyver takluyver closed this November 09, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Nov 09, 2011
Thomas Kluyver Fixes for parallel code on Python 3. a5245d0
This page is out of date. Refresh to see the latest.
2  IPython/parallel/apps/ipcontrollerapp.py
@@ -273,7 +273,7 @@ def init_hub(self):
273 273
         if not self.reuse_files:
274 274
             # save to new json config files
275 275
             f = self.factory
276  
-            cdict = {'exec_key' : f.session.key,
  276
+            cdict = {'exec_key' : f.session.key.decode('ascii'),
277 277
                     'ssh' : self.ssh_server,
278 278
                     'url' : "%s://%s:%s"%(f.client_transport, f.client_ip, f.regport),
279 279
                     'location' : self.location
2  IPython/utils/traitlets.py
@@ -961,7 +961,7 @@ def validate (self, obj, value):
961 961
 class Bytes(TraitType):
962 962
     """A trait for byte strings."""
963 963
 
964  
-    default_value = ''
  964
+    default_value = b''
965 965
     info_text = 'a string'
966 966
 
967 967
     def validate(self, obj, value):
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.