Tidy up CStr and Str traits from newapp merge.

IPython/parallel/client/client.py

@@ -318,6 +318,8 b' class Client(HasTraits):'
             if os.path.isfile(exec_key):
                 extra_args['keyfile'] = exec_key
             else:
+                if isinstance(exec_key, unicode):
+                    exec_key = exec_key.encode('ascii')
                 extra_args['key'] = exec_key
         self.session = Session(**extra_args)
         

IPython/parallel/controller/hub.py

@@ -30,7 +30,7 b' from zmq.eventloop.zmqstream import ZMQStream'
 # internal:
 from IPython.utils.importstring import import_item
 from IPython.utils.traitlets import (
-        HasTraits, Instance, Int, Unicode, Dict, Set, Tuple, CStr
+        HasTraits, Instance, Int, Unicode, Dict, Set, Tuple, Bytes
         )
 
 from IPython.parallel import error, util
@@ -111,10 +111,10 b' class EngineConnector(HasTraits):'
     heartbeat (str): identity of heartbeat XREQ socket
     """
     id=Int(0)
-    queue=CStr()
-    control=CStr()
-    registration=CStr()
-    heartbeat=CStr()
+    queue=Bytes()
+    control=Bytes()
+    registration=Bytes()
+    heartbeat=Bytes()
     pending=Set()
 
 class HubFactory(RegistrationFactory):

IPython/parallel/controller/scheduler.py

@@ -39,7 +39,7 b' from zmq.eventloop import ioloop, zmqstream'
 # local imports
 from IPython.external.decorator import decorator
 from IPython.config.loader import Config
-from IPython.utils.traitlets import Instance, Dict, List, Set, Int, Str, Enum
+from IPython.utils.traitlets import Instance, Dict, List, Set, Int, Enum
 
 from IPython.parallel import error
 from IPython.parallel.factory import SessionFactory

IPython/zmq/session.py

@@ -47,7 +47,7 b' from zmq.eventloop.zmqstream import ZMQStream'
 from IPython.config.configurable import Configurable, LoggingConfigurable
 from IPython.utils.importstring import import_item
 from IPython.utils.jsonutil import extract_dates, squash_dates, date_default
-from IPython.utils.traitlets import CStr, Unicode, Bool, Any, Instance, Set
+from IPython.utils.traitlets import Bytes, Unicode, Bool, Any, Instance, Set
 
 #-----------------------------------------------------------------------------
 # utility functions
@@ -238,7 +238,7 b' class Session(Configurable):'
         else:
             self.unpack = import_item(str(new))
         
-    session = CStr('', config=True,
+    session = Bytes(b'', config=True,
         help="""The UUID identifying this session.""")
     def _session_default(self):
         return bytes(uuid.uuid4())
@@ -247,7 +247,7 b' class Session(Configurable):'
         help="""Username for the Session. Default is your system username.""")
     
     # message signature related traits:
-    key = CStr('', config=True,
+    key = Bytes(b'', config=True,
         help="""execution key, for extra authentication.""")
     def _key_changed(self, name, old, new):
         if new: