Remove usage of prompt_manager

IPython/core/interactiveshell.py

@@ -56,7 +56,6 b' from IPython.core.macro import Macro'
 from IPython.core.payload import PayloadManager
 from IPython.core.prefilter import PrefilterManager
 from IPython.core.profiledir import ProfileDir
-from IPython.core.prompts import PromptManager
 from IPython.core.usage import default_banner
 from IPython.testing.skipdoctest import skip_doctest_py2, skip_doctest
 from IPython.utils import PyColorize
@@ -664,8 +663,6 b' class InteractiveShell(SingletonConfigurable):'
             io.stderr = io.IOStream(sys.stderr)
 
     def init_prompts(self):
-        self.prompt_manager = PromptManager(shell=self, parent=self)
-        self.configurables.append(self.prompt_manager)
         # Set system prompts, so that scripts can decide if they are running
         # interactively.
         sys.ps1 = 'In : '

IPython/core/magics/basic.py

@@ -356,14 +356,6 b' Defaulting color scheme to \'NoColor\'"""'
                 # Will remove this check after switching to prompt_toolkit
                 new_scheme = 'NoColor'
 
-        # Set prompt colors
-        try:
-            shell.prompt_manager.color_scheme = new_scheme
-        except:
-            color_switch_err('prompt')
-        else:
-            shell.colors = \
-                   shell.prompt_manager.color_scheme_table.active_scheme_name
         # Set exception colors
         try:
             shell.InteractiveTB.set_colors(scheme = new_scheme)
@@ -435,7 +427,6 b' Defaulting color scheme to \'NoColor\'"""'
 
         # Shorthands
         shell = self.shell
-        pm = shell.prompt_manager
         meta = shell.meta
         disp_formatter = self.shell.display_formatter
         ptformatter = disp_formatter.formatters['text/plain']
@@ -457,16 +448,12 b' Defaulting color scheme to \'NoColor\'"""'
 
         if not mode:
             # turn on
-            pm.in_template = '>>> '
-            pm.in2_template = '... '
-            pm.out_template = ''
 
             # Prompt separators like plain python
             shell.separate_in = ''
             shell.separate_out = ''
             shell.separate_out2 = ''
 
-            pm.justify = False
 
             ptformatter.pprint = False
             disp_formatter.active_types = ['text/plain']
@@ -474,15 +461,11 b' Defaulting color scheme to \'NoColor\'"""'
             shell.magic('xmode Plain')
         else:
             # turn off
-            pm.in_template, pm.in2_template, pm.out_template = dstore.prompt_templates
-
             shell.separate_in = dstore.rc_separate_in
 
             shell.separate_out = dstore.rc_separate_out
             shell.separate_out2 = dstore.rc_separate_out2
 
-            pm.justify = dstore.rc_prompts_pad_left
-
             ptformatter.pprint = dstore.rc_pprint
             disp_formatter.active_types = dstore.rc_active_types
 

IPython/core/tests/test_run.py

@@ -205,13 +205,6 b' class TestMagicRunPass(tt.TempFileMixin):'
         _ip = get_ipython()
         self.run_tmpfile()
         nt.assert_equal(type(_ip.user_ns['__builtins__']),type(sys))
-
-    def test_prompts(self):
-        """Test that prompts correctly generate after %run"""
-        self.run_tmpfile()
-        _ip = get_ipython()
-        p2 = _ip.prompt_manager.render('in2').strip()
-        nt.assert_equal(p2[:3], '...')
         
     def test_run_profile( self ):
         """Test that the option -p, which invokes the profiler, do not

IPython/sphinxext/ipython_directive.py

@@ -898,7 +898,6 b' class IPythonDirective(Directive):'
         if not self.state.document.current_source in self.seen_docs:
             self.shell.IP.history_manager.reset()
             self.shell.IP.execution_count = 1
-            self.shell.IP.prompt_manager.width = 0
             self.seen_docs.add(self.state.document.current_source)
 
         # and attach to shell so we don't have to pass them around

IPython/terminal/interactiveshell.py

@@ -614,7 +614,7 b' class TerminalInteractiveShell(InteractiveShell):'
             self.hooks.pre_prompt_hook()
             if more:
                 try:
-                    prompt = self.prompt_manager.render('in2')
+                    prompt = '   ...: '
                 except:
                     self.showtraceback()
                 if self.autoindent:
@@ -622,7 +622,7 b' class TerminalInteractiveShell(InteractiveShell):'
 
             else:
                 try:
-                    prompt = self.separate_in + self.prompt_manager.render('in')
+                    prompt = self.separate_in + 'In [{}]: '.format(self.execution_count)
                 except:
                     self.showtraceback()
             try:

IPython/terminal/ipapp.py

@@ -24,7 +24,6 b' from IPython.core.completer import IPCompleter'
 from IPython.core.crashhandler import CrashHandler
 from IPython.core.formatters import PlainTextFormatter
 from IPython.core.history import HistoryManager
-from IPython.core.prompts import PromptManager
 from IPython.core.application import (
     ProfileDir, BaseIPythonApplication, base_flags, base_aliases
 )
@@ -195,7 +194,6 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
             InteractiveShellApp, # ShellApp comes before TerminalApp, because
             self.__class__,      # it will also affect subclasses (e.g. QtConsole)
             TerminalInteractiveShell,
-            PromptManager,
             HistoryManager,
             ProfileDir,
             PlainTextFormatter,