From a5245d038f390cf2730dd0e95657013b6e564fce 2011-11-09 22:59:18
From: Thomas Kluyver <takowl@gmail.com>
Date: 2011-11-09 22:59:18
Subject: [PATCH] Fixes for parallel code on Python 3.

---

diff --git a/IPython/parallel/apps/ipcontrollerapp.py b/IPython/parallel/apps/ipcontrollerapp.py
index 66c7fd8..aa6b253 100755
--- a/IPython/parallel/apps/ipcontrollerapp.py
+++ b/IPython/parallel/apps/ipcontrollerapp.py
@@ -273,7 +273,7 @@ class IPControllerApp(BaseParallelApplication):
         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
diff --git a/IPython/utils/traitlets.py b/IPython/utils/traitlets.py
index 895a675..15dadce 100644
--- a/IPython/utils/traitlets.py
+++ b/IPython/utils/traitlets.py
@@ -961,7 +961,7 @@ class CComplex(Complex):
 class Bytes(TraitType):
     """A trait for byte strings."""
 
-    default_value = ''
+    default_value = b''
     info_text = 'a string'
 
     def validate(self, obj, value):