From 803e9950b6255c44e622ca922871b579cb3841cd 2014-01-21 20:19:47
From: Thomas Kluyver <takowl@gmail.com>
Date: 2014-01-21 20:19:47
Subject: [PATCH] Backport PR #4345: Make irunner compatible with upcoming pexpect 3.0 interface

`irunner` is designed to use the native string type on both Python 2 and Python 3. This allows it to use the correct form of `pexpect.spawn`.

---

diff --git a/IPython/lib/irunner.py b/IPython/lib/irunner.py
index de4a63b..cabf1b9 100755
--- a/IPython/lib/irunner.py
+++ b/IPython/lib/irunner.py
@@ -39,6 +39,16 @@ import sys
 from IPython.external import pexpect
 from IPython.utils import py3compat
 
+# We want to use native strings on both versions of Python, and with two
+# different versions of pexpect.
+if py3compat.PY3:
+    try:
+        spawn = pexpect.spawnu   # Pexpect 3.0 +
+    except AttributeError:
+        spawn = pexpect.spawn    # pexpect-u fork
+else:
+    spawn = pexpect.spawn
+
 # Global usage strings, to avoid indentation issues when typing it below.
 USAGE = """
 Interactive script runner, type: %s
@@ -134,7 +144,7 @@ class InteractiveRunner(object):
 
         # Create child process and hold on to it so we don't have to re-create
         # for every single execution call
-        c = self.child = pexpect.spawn(self.program,self.args,timeout=None)
+        c = self.child = spawn(self.program,self.args,timeout=None)
         c.delaybeforesend = self.delaybeforesend
         # pexpect hard-codes the terminal size as (24,80) (rows,columns).
         # This causes problems because any line longer than 80 characters gets