##// END OF EJS Templates
Merge pull request #4346 from takluyver/win-kernel-getpass...
Min RK -
r12914:a34479b9 merge
parent child Browse files
Show More
@@ -38,7 +38,7 b' from IPython.config import Configurable'
38 from IPython.core.profiledir import ProfileDir
38 from IPython.core.profiledir import ProfileDir
39 from IPython.utils.localinterfaces import localhost
39 from IPython.utils.localinterfaces import localhost
40 from IPython.utils.path import filefind, get_ipython_dir
40 from IPython.utils.path import filefind, get_ipython_dir
41 from IPython.utils.py3compat import str_to_bytes, bytes_to_str
41 from IPython.utils.py3compat import str_to_bytes, bytes_to_str, cast_bytes_py2
42 from IPython.utils.traitlets import (
42 from IPython.utils.traitlets import (
43 Bool, Integer, Unicode, CaselessStrEnum,
43 Bool, Integer, Unicode, CaselessStrEnum,
44 )
44 )
@@ -362,7 +362,7 b' def tunnel_to_kernel(connection_info, sshserver, sshkey=None):'
362 if tunnel.try_passwordless_ssh(sshserver, sshkey):
362 if tunnel.try_passwordless_ssh(sshserver, sshkey):
363 password=False
363 password=False
364 else:
364 else:
365 password = getpass("SSH Password for %s: "%sshserver)
365 password = getpass("SSH Password for %s: " % cast_bytes_py2(sshserver))
366
366
367 for lp,rp in zip(lports, rports):
367 for lp,rp in zip(lports, rports):
368 tunnel.ssh_tunnel(lp, rp, sshserver, remote_ip, sshkey, password)
368 tunnel.ssh_tunnel(lp, rp, sshserver, remote_ip, sshkey, password)
General Comments 0
You need to be logged in to leave comments. Login now