summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kluyver <takowl@gmail.com>2015-06-17 11:06:19 -0700
committerThomas Kluyver <takowl@gmail.com>2015-06-17 11:06:19 -0700
commit52e24104b4c3aa105582c66aad273af01837bf07 (patch)
treee7f5259d9e0ee1899a7606accd41e23c3e575d66
parent57a55194771088b8ad076c3aea591e2355c15979 (diff)
parentaa580c4d8e0b2070a389dbcb5b1bbe108827c068 (diff)
downloadpexpect-git-52e24104b4c3aa105582c66aad273af01837bf07.tar.gz
Merge pull request #223 from minrk/replwrap-unicode-cmd
accept unicode cmd on Python 2
-rw-r--r--pexpect/replwrap.py3
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