From 25b5f87e98c9ea29de3ad1d79e6cc7e72cdc6f03 2012-09-01 21:03:37
From: MinRK <benjaminrk@gmail.com>
Date: 2012-09-01 21:03:37
Subject: [PATCH] Backport PR #2280: fix SSH passwordless check for OpenSSH

pexpect takes a regular expression, so we want '[Pp]assword:', not
'[Ppassword]:'.

---

diff --git a/IPython/external/ssh/tunnel.py b/IPython/external/ssh/tunnel.py
index 4fce68c..9ae2311 100644
--- a/IPython/external/ssh/tunnel.py
+++ b/IPython/external/ssh/tunnel.py
@@ -97,7 +97,7 @@ def _try_passwordless_openssh(server, keyfile):
     p = pexpect.spawn(cmd)
     while True:
         try:
-            p.expect('[Ppassword]:', timeout=.1)
+            p.expect('[Pp]assword:', timeout=.1)
         except pexpect.TIMEOUT:
             continue
         except pexpect.EOF: