remove pexpect from external

make it a dependency on non-Windows

IPython/terminal/console/tests/test_console.py

@@ -62,7 +62,7 def stop_console(p, pexpect, t):
 
 def start_console():
     "Start `ipython console` using pexpect"
-    from IPython.external import pexpect
+    import pexpect
     
     args = ['-m', 'IPython', 'console', '--colors=NoColor']
     cmd = sys.executable

IPython/terminal/tests/test_embed.py

@@ -60,7 +60,7 def test_ipython_embed():
 @skip_win32
 def test_nest_embed():
     """test that `IPython.embed()` is nestable"""
-    from IPython.external import pexpect
+    import pexpect
     ipy_prompt = r']:' #ansi color codes give problems matching beyond this
 
 

IPython/testing/iptest.py

@@ -42,12 +42,6 from IPython.external.decorators import KnownFailure, knownfailureif
 
 pjoin = path.join
 
-
-#-----------------------------------------------------------------------------
-# Globals
-#-----------------------------------------------------------------------------
-
-
 #-----------------------------------------------------------------------------
 # Warnings control
 #-----------------------------------------------------------------------------
@@ -127,7 +121,7 have = {}
 have['curses'] = test_for('_curses')
 have['matplotlib'] = test_for('matplotlib')
 have['numpy'] = test_for('numpy')
-have['pexpect'] = test_for('IPython.external.pexpect')
+have['pexpect'] = test_for('pexpect')
 have['pymongo'] = test_for('pymongo')
 have['pygments'] = test_for('pygments')
 have['qt'] = test_for('IPython.external.qt')

IPython/utils/_process_posix.py

@@ -21,7 +21,7 import os
 import subprocess as sp
 import sys
 
-from IPython.external import pexpect
+import pexpect
 
 # Our own
 from ._process_common import getoutput, arg_split

setup.py

@@ -273,13 +273,16 install_requires = [
     'path.py', # required by pickleshare, remove when pickleshare is added here
 ]
 
-# add readline
+# add platform-specific dependencies
 if sys.platform == 'darwin':
     install_requires.append('appnope')
     if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline():
         install_requires.append('gnureadline')
-elif sys.platform.startswith('win'):
+
+if sys.platform.startswith('win'):
     extras_require['terminal'].append('pyreadline>=2.0')
+else:
+    install_requires.append('pexpect')
 
 everything = set()
 for deps in extras_require.values():

setupbase.py

@@ -670,7 +670,7 def get_bdist_wheel():
                     if found:
                         lis.pop(idx)
                 
-                for pkg in ("gnureadline", "pyreadline", "mock", "appnope", "terminado"):
+                for pkg in ("gnureadline", "pyreadline", "mock", "terminado", "appnope", "pexpect"):
                     _remove_startswith(requires, pkg)
                 requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'")
                 requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'")
@@ -679,6 +679,7 def get_bdist_wheel():
                 requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
                 requires.append("mock; extra == 'test' and python_version < '3.3'")
                 requires.append("appnope; sys.platform == 'darwin'")
+                requires.append("pexpect; sys.platform != 'win32'")
                 for r in requires:
                     pkg_info['Requires-Dist'] = r
                 write_pkg_info(metadata_path, pkg_info)