Switch prompts for doctest_mode

IPython/core/interactiveshell.py

@@ -3219,6 +3219,11 b' class InteractiveShell(SingletonConfigurable):'
         self.restore_sys_module_state()
 
 
+    # Overridden in terminal subclass to change prompts
+    def switch_doctest_mode(self, mode):
+        pass
+
+
 class InteractiveShellABC(with_metaclass(abc.ABCMeta, object)):
     """An abstract base class for InteractiveShell."""
 

IPython/core/magics/basic.py

@@ -469,8 +469,12 b' Defaulting color scheme to \'NoColor\'"""'
 
             shell.magic('xmode ' + dstore.xmode)
 
+        # mode here is the state before we switch; switch_doctest_mode takes
+        # the mode we're switching to.
+        shell.switch_doctest_mode(not mode)
+
         # Store new mode and inform
-        dstore.mode = bool(1-int(mode))
+        dstore.mode = bool(not mode)
         mode_label = ['OFF','ON'][dstore.mode]
         print('Doctest mode is:', mode_label)
 

IPython/terminal/prompts.py

@@ -41,6 +41,23 b' class Prompts(object):'
             (Token.OutPrompt, ']: '),
         ]
 
+class ClassicPrompts(Prompts):
+    def in_prompt_tokens(self, cli=None):
+        return [
+            (Token.Prompt, '>>> '),
+        ]
+
+    def continuation_prompt_tokens(self, cli=None, width=None):
+        return [
+            (Token.Prompt, '... ')
+        ]
+
+    def rewrite_prompt_tokens(self):
+        return []
+
+    def out_prompt_tokens(self):
+        return []
+
 class RichPromptDisplayHook(DisplayHook):
     """Subclass of base display hook using coloured prompt"""
     def write_output_prompt(self):

IPython/terminal/ptshell.py

@@ -29,7 +29,7 b' from pygments.token import Token'
 from .debugger import TerminalPdb, Pdb
 from .pt_inputhooks import get_inputhook_func
 from .interactiveshell import get_default_editor, TerminalMagics
-from .prompts import Prompts, RichPromptDisplayHook
+from .prompts import Prompts, ClassicPrompts, RichPromptDisplayHook
 from .ptutils import IPythonPTCompleter, IPythonPTLexer
 
 _use_simple_prompt = 'IPY_TEST_SIMPLE_PROMPT' in os.environ or not sys.stdin.isatty()
@@ -105,6 +105,10 b' class TerminalInteractiveShell(InteractiveShell):'
     def _prompts_default(self):
         return Prompts(self)
 
+    @observe('prompts')
+    def _(self, change):
+        self._update_layout()
+
     def _displayhook_class_default(self):
         return RichPromptDisplayHook
 
@@ -451,6 +455,16 b' class TerminalInteractiveShell(InteractiveShell):'
             prompt = ''.join(s for t, s in tokens)
             print(prompt, cmd, sep='')
 
+    _prompts_before = None
+    def switch_doctest_mode(self, mode):
+        """Switch prompts to classic for %doctest_mode"""
+        if mode:
+            self._prompts_before = self.prompts
+            self.prompts = ClassicPrompts(self)
+        elif self._prompts_before:
+            self.prompts = self._prompts_before
+            self._prompts_before = None
+
 
 if __name__ == '__main__':
     TerminalInteractiveShell.instance().interact()