##// END OF EJS Templates
Merge pull request #8187 from minrk/parallel_allow_none...
Thomas Kluyver -
r20993:05d48c8d merge
parent child Browse files
Show More
@@ -345,16 +345,15 b' class Client(HasTraits):'
345 _ids = List()
345 _ids = List()
346 _connected=Bool(False)
346 _connected=Bool(False)
347 _ssh=Bool(False)
347 _ssh=Bool(False)
348 _context = Instance('zmq.Context')
348 _context = Instance('zmq.Context', allow_none=True)
349 _config = Dict()
349 _config = Dict()
350 _engines=Instance(util.ReverseDict, (), {})
350 _engines=Instance(util.ReverseDict, (), {})
351 # _hub_socket=Instance('zmq.Socket')
351 _query_socket=Instance('zmq.Socket', allow_none=True)
352 _query_socket=Instance('zmq.Socket')
352 _control_socket=Instance('zmq.Socket', allow_none=True)
353 _control_socket=Instance('zmq.Socket')
353 _iopub_socket=Instance('zmq.Socket', allow_none=True)
354 _iopub_socket=Instance('zmq.Socket')
354 _notification_socket=Instance('zmq.Socket', allow_none=True)
355 _notification_socket=Instance('zmq.Socket')
355 _mux_socket=Instance('zmq.Socket', allow_none=True)
356 _mux_socket=Instance('zmq.Socket')
356 _task_socket=Instance('zmq.Socket', allow_none=True)
357 _task_socket=Instance('zmq.Socket')
358 _task_scheme=Unicode()
357 _task_scheme=Unicode()
359 _closed = False
358 _closed = False
360 _ignored_control_replies=Integer(0)
359 _ignored_control_replies=Integer(0)
@@ -109,7 +109,7 b' class View(HasTraits):'
109 results = Dict()
109 results = Dict()
110 client = Instance('ipython_parallel.Client', allow_none=True)
110 client = Instance('ipython_parallel.Client', allow_none=True)
111
111
112 _socket = Instance('zmq.Socket')
112 _socket = Instance('zmq.Socket', allow_none=True)
113 _flag_names = List(['targets', 'block', 'track'])
113 _flag_names = List(['targets', 'block', 'track'])
114 _in_sync_results = Bool(False)
114 _in_sync_results = Bool(False)
115 _targets = Any()
115 _targets = Any()
General Comments 0
You need to be logged in to leave comments. Login now