From 5ab676d01b776f56ada650c31da3e63cf896a79b 2013-10-04 19:31:19
From: Thomas Kluyver <takowl@gmail.com>
Date: 2013-10-04 19:31:19
Subject: [PATCH] Use cast_bytes_py2 for getpass() prompt

---

diff --git a/IPython/kernel/connect.py b/IPython/kernel/connect.py
index e9c5fb7..baa75c5 100644
--- a/IPython/kernel/connect.py
+++ b/IPython/kernel/connect.py
@@ -38,7 +38,7 @@ from IPython.config import Configurable
 from IPython.core.profiledir import ProfileDir
 from IPython.utils.localinterfaces import LOCALHOST
 from IPython.utils.path import filefind, get_ipython_dir
-from IPython.utils.py3compat import str_to_bytes, bytes_to_str
+from IPython.utils.py3compat import str_to_bytes, bytes_to_str, cast_bytes_py2
 from IPython.utils.traitlets import (
     Bool, Integer, Unicode, CaselessStrEnum,
 )
@@ -360,7 +360,7 @@ def tunnel_to_kernel(connection_info, sshserver, sshkey=None):
     if tunnel.try_passwordless_ssh(sshserver, sshkey):
         password=False
     else:
-        password = getpass("SSH Password for %s: "%str(sshserver))
+        password = getpass("SSH Password for %s: " % cast_bytes_py2(sshserver))
     
     for lp,rp in zip(lports, rports):
         tunnel.ssh_tunnel(lp, rp, sshserver, remote_ip, sshkey, password)