From d49dfb2290a859f24a0967b6f70c51382ebdef4d 2011-07-28 12:46:57
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2011-07-28 12:46:57
Subject: [PATCH] Use IPython.external for pexpect import.

This makes irunner safe if the user doesn't have a system install of
pexpect.

Closes gh-628.

---

diff --git a/IPython/lib/irunner.py b/IPython/lib/irunner.py
index 8175168..53c7346 100755
--- a/IPython/lib/irunner.py
+++ b/IPython/lib/irunner.py
@@ -35,8 +35,9 @@ import optparse
 import os
 import sys
 
-# Third-party modules.
-import pexpect
+# Third-party modules: we carry a copy of pexpect to reduce the need for
+# external dependencies, but our import checks for a system version first.
+from IPython.external import pexpect
 
 # Global usage strings, to avoid indentation issues when typing it below.
 USAGE = """