Show More
@@ -367,7 +367,7 b' class IPControllerApp(BaseParallelApplication):' | |||||
367 | # IOPub relay (in a Process) |
|
367 | # IOPub relay (in a Process) | |
368 | q = mq(zmq.PUB, zmq.SUB, zmq.PUB, b'N/A',b'iopub') |
|
368 | q = mq(zmq.PUB, zmq.SUB, zmq.PUB, b'N/A',b'iopub') | |
369 | q.bind_in(f.client_url('iopub')) |
|
369 | q.bind_in(f.client_url('iopub')) | |
370 | q.setsockopt_in(zmq.IDENTITY, ident+"_iopub") |
|
370 | q.setsockopt_in(zmq.IDENTITY, ident + b"_iopub") | |
371 | q.bind_out(f.engine_url('iopub')) |
|
371 | q.bind_out(f.engine_url('iopub')) | |
372 | q.setsockopt_out(zmq.SUBSCRIBE, b'') |
|
372 | q.setsockopt_out(zmq.SUBSCRIBE, b'') | |
373 | q.connect_mon(monitor_url) |
|
373 | q.connect_mon(monitor_url) |
@@ -449,7 +449,7 b' class Client(HasTraits):' | |||||
449 | # configure and construct the session |
|
449 | # configure and construct the session | |
450 | extra_args['packer'] = cfg['pack'] |
|
450 | extra_args['packer'] = cfg['pack'] | |
451 | extra_args['unpacker'] = cfg['unpack'] |
|
451 | extra_args['unpacker'] = cfg['unpack'] | |
452 | extra_args['key'] = cfg['exec_key'] |
|
452 | extra_args['key'] = cast_bytes(cfg['exec_key']) | |
453 |
|
453 | |||
454 | self.session = Session(**extra_args) |
|
454 | self.session = Session(**extra_args) | |
455 |
|
455 |
@@ -896,7 +896,7 b' class Hub(SessionFactory):' | |||||
896 |
|
896 | |||
897 | content = dict(id=eid,status='ok') |
|
897 | content = dict(id=eid,status='ok') | |
898 | # check if requesting available IDs: |
|
898 | # check if requesting available IDs: | |
899 | if uuid in self.by_ident: |
|
899 | if cast_bytes(uuid) in self.by_ident: | |
900 | try: |
|
900 | try: | |
901 | raise KeyError("uuid %r in use" % uuid) |
|
901 | raise KeyError("uuid %r in use" % uuid) | |
902 | except: |
|
902 | except: | |
@@ -1014,7 +1014,7 b' class Hub(SessionFactory):' | |||||
1014 | self.ids.add(eid) |
|
1014 | self.ids.add(eid) | |
1015 | self.keytable[eid] = ec.uuid |
|
1015 | self.keytable[eid] = ec.uuid | |
1016 | self.engines[eid] = ec |
|
1016 | self.engines[eid] = ec | |
1017 | self.by_ident[ec.uuid] = ec.id |
|
1017 | self.by_ident[cast_bytes(ec.uuid)] = ec.id | |
1018 | self.queues[eid] = list() |
|
1018 | self.queues[eid] = list() | |
1019 | self.tasks[eid] = list() |
|
1019 | self.tasks[eid] = list() | |
1020 | self.completed[eid] = list() |
|
1020 | self.completed[eid] = list() |
@@ -756,11 +756,11 b' def launch_scheduler(in_addr, out_addr, mon_addr, not_addr, reg_addr, config=Non' | |||||
756 | ctx = zmq.Context() |
|
756 | ctx = zmq.Context() | |
757 | loop = ioloop.IOLoop() |
|
757 | loop = ioloop.IOLoop() | |
758 | ins = ZMQStream(ctx.socket(zmq.ROUTER),loop) |
|
758 | ins = ZMQStream(ctx.socket(zmq.ROUTER),loop) | |
759 | ins.setsockopt(zmq.IDENTITY, identity+'_in') |
|
759 | ins.setsockopt(zmq.IDENTITY, identity + b'_in') | |
760 | ins.bind(in_addr) |
|
760 | ins.bind(in_addr) | |
761 |
|
761 | |||
762 | outs = ZMQStream(ctx.socket(zmq.ROUTER),loop) |
|
762 | outs = ZMQStream(ctx.socket(zmq.ROUTER),loop) | |
763 | outs.setsockopt(zmq.IDENTITY, identity+'_out') |
|
763 | outs.setsockopt(zmq.IDENTITY, identity + b'_out') | |
764 | outs.bind(out_addr) |
|
764 | outs.bind(out_addr) | |
765 | mons = zmqstream.ZMQStream(ctx.socket(zmq.PUB),loop) |
|
765 | mons = zmqstream.ZMQStream(ctx.socket(zmq.PUB),loop) | |
766 | mons.connect(mon_addr) |
|
766 | mons.connect(mon_addr) |
General Comments 0
You need to be logged in to leave comments.
Login now