##// END OF EJS Templates
Merge pull request #3910 from dhirschfeld/config-error...
Min RK -
r12003:d462a895 merge
parent child Browse files
Show More
@@ -460,10 +460,17 b' class Client(HasTraits):'
460 ssh_kwargs = dict(keyfile=sshkey, password=password, paramiko=paramiko)
460 ssh_kwargs = dict(keyfile=sshkey, password=password, paramiko=paramiko)
461
461
462 # configure and construct the session
462 # configure and construct the session
463 extra_args['packer'] = cfg['pack']
463 try:
464 extra_args['unpacker'] = cfg['unpack']
464 extra_args['packer'] = cfg['pack']
465 extra_args['key'] = cast_bytes(cfg['key'])
465 extra_args['unpacker'] = cfg['unpack']
466 extra_args['signature_scheme'] = cfg['signature_scheme']
466 extra_args['key'] = cast_bytes(cfg['key'])
467 extra_args['signature_scheme'] = cfg['signature_scheme']
468 except KeyError as exc:
469 msg = '\n'.join([
470 "Connection file is invalid (missing '{}'), possibly from an old version of IPython.",
471 "If you are reusing connection files, remove them and start ipcontroller again."
472 ])
473 raise ValueError(msg.format(exc.message))
467
474
468 self.session = Session(**extra_args)
475 self.session = Session(**extra_args)
469
476
General Comments 0
You need to be logged in to leave comments. Login now