summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoah <noah@656d521f-e311-0410-88e0-e7920216d269>2007-06-27 23:14:01 +0000
committernoah <noah@656d521f-e311-0410-88e0-e7920216d269>2007-06-27 23:14:01 +0000
commit9397f4733605a7b36722a36e03dcb5c95239ea28 (patch)
tree063ea56bb8ca8d13a1d2075914772daef2a076bc
parent846c4fae21e031ad1254af88ff5969dfdd38a975 (diff)
downloadpexpect-9397f4733605a7b36722a36e03dcb5c95239ea28.tar.gz
Added Andrew Stone to credits also added his cache clearing patch.
git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@479 656d521f-e311-0410-88e0-e7920216d269
-rw-r--r--pexpect/pexpect.py4
-rw-r--r--pexpect/pxssh.py3
2 files changed, 5 insertions, 2 deletions
diff --git a/pexpect/pexpect.py b/pexpect/pexpect.py
index e9b237b..1670e3f 100644
--- a/pexpect/pexpect.py
+++ b/pexpect/pexpect.py
@@ -34,8 +34,8 @@ Credits: Noah Spurrier, Richard Holden, Marco Molteni, Kimberley Burchett,
Robert Stone, Hartmut Goebel, Chad Schroeder, Erick Tryzelaar, Dave Kirby, Ids
vander Molen, George Todd, Noel Taylor, Nicolas D. Cesar, Alexander Gattin,
Geoffrey Marshall, Francisco Lourenco, Glen Mabey, Karthik Gurusamy, Fernando
-Perez, Corey Minyard, Jon Cohen, Guillaume Chazarain, Andrew Ryan, Nick Craig-Wood
-(Let me know if I forgot anyone.)
+Perez, Corey Minyard, Jon Cohen, Guillaume Chazarain, Andrew Ryan, Nick
+Craig-Wood, Andrew Stone (Let me know if I forgot anyone.)
Free, open source, and all that good stuff.
diff --git a/pexpect/pxssh.py b/pexpect/pxssh.py
index 79224b8..9c8b15b 100644
--- a/pexpect/pxssh.py
+++ b/pexpect/pxssh.py
@@ -3,6 +3,7 @@ This adds methods for login, logout, and expecting the shell prompt.
$Id$
"""
+
from pexpect import *
import pexpect
import time
@@ -129,6 +130,8 @@ class pxssh (spawn):
# I came up with these based on what seemed reliable for
# connecting to a heavily loaded machine I have.
# If latency is worse than these values then this will fail.
+
+ self.read_nonblocking(size=10000,timeout=1) # GAS: Clear out the cache before getting the prompt
time.sleep(0.1)
self.sendline()
time.sleep(0.5)