diff options
author | Jeff Quast <contact@jeffquast.com> | 2015-09-20 19:43:31 -0700 |
---|---|---|
committer | Jeff Quast <contact@jeffquast.com> | 2015-09-20 19:43:31 -0700 |
commit | b6e25ba148a4ffdf5ba0e4ba61aa78f449773cca (patch) | |
tree | ba2eec8a8bd1df7f0b21115f8ae8896db9ad364c /pexpect/replwrap.py | |
parent | 7f046a6cf86d8f60a6cf23c40ef625e5acbc1a32 (diff) | |
parent | f5993888e092bd8cecc98ac9558700d4fe8624cf (diff) | |
download | pexpect-git-document-blocking-write.tar.gz |
Merge remote-tracking branch 'origin/master' into document-blocking-writedocument-blocking-write
Diffstat (limited to 'pexpect/replwrap.py')
-rw-r--r-- | pexpect/replwrap.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pexpect/replwrap.py b/pexpect/replwrap.py index 7b0e823..83a09c2 100644 --- a/pexpect/replwrap.py +++ b/pexpect/replwrap.py @@ -11,6 +11,7 @@ PY3 = (sys.version_info[0] >= 3) if PY3: def u(s): return s + basestring = str else: def u(s): return s.decode('utf-8') @@ -37,7 +38,7 @@ class REPLWrapper(object): new_prompt=PEXPECT_PROMPT, continuation_prompt=PEXPECT_CONTINUATION_PROMPT, extra_init_cmd=None): - if isinstance(cmd_or_spawn, str): + if isinstance(cmd_or_spawn, basestring): self.child = pexpect.spawnu(cmd_or_spawn, echo=False) else: self.child = cmd_or_spawn |