summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kluyver <takowl@gmail.com>2015-09-12 11:37:10 +0100
committerThomas Kluyver <takowl@gmail.com>2015-09-12 11:46:03 +0100
commit3654b5b9b3286c34cb02a93504199e93bb90576c (patch)
tree5188ba115df9a3e2fb9dbe2556ef58afe220adc9
parent84ffcdb864d3191f8e25a36799a80948ea7bba3f (diff)
downloadpexpect-git-3654b5b9b3286c34cb02a93504199e93bb90576c.tar.gz
Add encoding parameter to pxsshu
Closes gh-172 (alternative approach to the same problem) Closes gh-169
-rw-r--r--pexpect/pxssh.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pexpect/pxssh.py b/pexpect/pxssh.py
index 71f56a0..c5cbd35 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>'