remove rest of readline, pass II

IPython/core/interactiveshell.py

@@ -62,7 +62,6 b' from IPython.utils import PyColorize'
 from IPython.utils import io
 from IPython.utils import py3compat
 from IPython.utils import openpy
-from IPython.utils.contexts import NoOpContext
 from IPython.utils.decorators import undoc
 from IPython.utils.io import ask_yes_no
 from IPython.utils.ipstruct import Struct
@@ -574,9 +573,6 b' class InteractiveShell(SingletonConfigurable):'
         self.tempfiles = []
         self.tempdirs = []
 
-        # Keep track of readline usage (later set by init_readline)
-        self.has_readline = False
-
         # keep track of where we started running (mainly for crash post-mortem)
         # This is not being used anywhere currently.
         self.starting_dir = py3compat.getcwd()
@@ -659,9 +655,6 b' class InteractiveShell(SingletonConfigurable):'
         # override sys.stdout and sys.stderr themselves, you need to do that
         # *before* instantiating this class, because io holds onto
         # references to the underlying streams.
-        if (sys.platform == 'win32' or sys.platform == 'cli') and self.has_readline:
-            io.stdout = io.stderr = io.IOStream(self.readline._outputfile)
-        else:
             io.stdout = io.IOStream(sys.stdout)
             io.stderr = io.IOStream(sys.stderr)
 
@@ -984,8 +977,6 b' class InteractiveShell(SingletonConfigurable):'
             error('No traceback has been produced, nothing to debug.')
             return
 
-
-        with self.readline_no_record:
             self.InteractiveTB.debugger(force=True)
 
     #-------------------------------------------------------------------------
@@ -1889,10 +1880,7 b' class InteractiveShell(SingletonConfigurable):'
 
     def init_readline(self):
         """Moved to terminal subclass, here only to simplify the init logic."""
-        self.readline = None
         # Set a number of methods that depend on readline to be no-op
-        self.readline_no_record = NoOpContext()
-        self.set_readline_completer = no_op
         self.set_custom_completer = no_op
 
     @skip_doctest
@@ -1929,7 +1917,7 b' class InteractiveShell(SingletonConfigurable):'
         self.Completer = IPCompleter(shell=self,
                                      namespace=self.user_ns,
                                      global_namespace=self.user_global_ns,
-                                     use_readline=self.has_readline,
+                                     use_readline=False,
                                      parent=self,
                                      )
         self.configurables.append(self.Completer)

IPython/core/magics/execution.py

@@ -705,7 +705,6 b' python-profiler package from non-free.""")'
 
         try:
             stats = None
-            with self.shell.readline_no_record:
                 if 'p' in opts:
                     stats = self._run_with_profiler(code, opts, code_ns)
                 else:

IPython/core/shellapp.py

@@ -343,12 +343,6 b' class InteractiveShellApp(Configurable):'
             except:
                 self.log.warning("Unknown error in handling PYTHONSTARTUP file %s:", python_startup)
                 self.shell.showtraceback()
-            finally:
-                # Many PYTHONSTARTUP files set up the readline completions,
-                # but this is often at odds with IPython's own completions.
-                # Do not allow PYTHONSTARTUP to set up readline.
-                if self.shell.has_readline:
-                    self.shell.set_readline_completer()
         
         startup_files += glob.glob(os.path.join(startup_dir, '*.py'))
         startup_files += glob.glob(os.path.join(startup_dir, '*.ipy'))

IPython/core/ultratb.py

@@ -115,7 +115,6 b' from inspect import getsourcefile, getfile, getmodule, \\'
     ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode
 
 # IPython's own modules
-# Modified pdb which doesn't damage IPython's readline handling
 from IPython import get_ipython
 from IPython.core import debugger
 from IPython.core.display_trap import DisplayTrap

IPython/terminal/embed.py

@@ -140,9 +140,6 b' class InteractiveShellEmbed(TerminalInteractiveShell):'
         if dummy or (dummy != 0 and self.dummy_mode):
             return
 
-        if self.has_readline:
-            self.set_readline_completer()
-
         # self.banner is auto computed
         if header:
             self.old_banner2 = self.banner2