Switch over to use prompt_toolkit in IPython

IPython/terminal/ipapp.py

@@ -32,7 +32,7 from IPython.core.shellapp import (
     InteractiveShellApp, shell_flags, shell_aliases
 )
 from IPython.extensions.storemagic import StoreMagics
-from IPython.terminal.interactiveshell import TerminalInteractiveShell
+from .ptshell import PTInteractiveShell as TerminalInteractiveShell
 from IPython.utils import warn
 from IPython.paths import get_ipython_dir
 from traitlets import (

setup.py

@@ -195,6 +195,7 install_requires = [
     'pickleshare',
     'simplegeneric>0.8',
     'traitlets',
+    'prompt_toolkit',  # We will require > 0.57 once a new release is made
 ]
 
 # Platform-specific dependencies:
@@ -204,8 +205,6 install_requires = [
 extras_require.update({
     ':sys_platform != "win32"': ['pexpect'],
     ':sys_platform == "darwin"': ['appnope'],
-    ':sys_platform == "darwin" and platform_python_implementation == "CPython"': ['gnureadline'],
-    'terminal:sys_platform == "win32"': ['pyreadline>=2'],
     'test:python_version == "2.7"': ['mock'],
 })
 # FIXME: re-specify above platform dependencies for pip < 6