diff options
Diffstat (limited to 'pexpect/pxssh.py')
| -rw-r--r-- | pexpect/pxssh.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pexpect/pxssh.py b/pexpect/pxssh.py index 71f56a0..4638164 100644 --- a/pexpect/pxssh.py +++ b/pexpect/pxssh.py @@ -95,9 +95,12 @@ class pxssh (spawn): def __init__ (self, timeout=30, maxread=2000, searchwindowsize=None, logfile=None, cwd=None, env=None, ignore_sighup=True, echo=True, - options={}): + options={}, encoding=None, codec_errors='strict'): - spawn.__init__(self, None, timeout=timeout, maxread=maxread, searchwindowsize=searchwindowsize, logfile=logfile, cwd=cwd, env=env, ignore_sighup=ignore_sighup, echo=echo) + spawn.__init__(self, None, timeout=timeout, maxread=maxread, + searchwindowsize=searchwindowsize, logfile=logfile, + cwd=cwd, env=env, ignore_sighup=ignore_sighup, echo=echo, + encoding=encoding, codec_errors=codec_errors) self.name = '<pxssh>' @@ -169,7 +172,7 @@ class pxssh (spawn): # maximum time for reading the entire prompt total_timeout = timeout_multiplier * 3.0 - prompt = b'' + prompt = self.string_type() begin = time.time() expired = 0.0 timeout = first_char_timeout @@ -334,7 +337,7 @@ class pxssh (spawn): if not self.set_unique_prompt(): self.close() raise ExceptionPxssh('could not set shell prompt ' - '(recieved: %r, expected: %r).' % ( + '(received: %r, expected: %r).' % ( self.before, self.PROMPT,)) return True |