Make doctest output compatible with old and new IPython

Author: tobiasdiez

src/sage/repl/ipython_extension.py

@@ -64,14 +64,14 @@
     sage: shell.quit()
 """
 
-from IPython.core.magic import Magics, magics_class, line_magic, cell_magic
 from IPython.core.display import HTML
 from IPython.core.getipython import get_ipython
+from IPython.core.magic import Magics, cell_magic, line_magic, magics_class
 
-from sage.repl.load import load_wrap
 from sage.env import SAGE_IMPORTALL, SAGE_STARTUP_FILE
 from sage.misc.lazy_import import LazyImport
 from sage.misc.misc import run_once
+from sage.repl.load import load_wrap
 
 
 def _running_in_notebook():
@@ -321,7 +321,7 @@ def display(self, args):
             if max_width <= 0:
                 raise ValueError(
                     "max width must be a positive integer")
-            import sage.typeset.character_art as character_art
+            from sage.typeset import character_art
             character_art.MAX_WIDTH = max_width
             dm.preferences.text = arg0
         # Unset all
@@ -478,9 +478,10 @@ def cython(self, line, cell):
             ...
             ValueError: No closing quotation
         """
-        from sage.misc.cython import cython_compile
-        import shlex
         import argparse
+        import shlex
+
+        from sage.misc.cython import cython_compile
 
         class ExitCatchingArgumentParser(argparse.ArgumentParser):
             def error(self, message):
@@ -665,7 +666,7 @@ def init_line_transforms(self):
              sage: ip.input_transformer_manager.check_complete('''  # indirect doctest
              ....: for i in [1 .. 2]:
              ....:     a = 2''')
-             ('incomplete', 2)
+             ('incomplete', ...)
              sage: ip.input_transformer_manager.check_complete('''
              ....: def foo(L)
              ....:     K.<a> = L''')
@@ -701,7 +702,8 @@ def init_line_transforms(self):
              ('incomplete', 4)
         """
         from IPython.core.inputtransformer2 import TransformerManager
-        from .interpreter import SagePromptTransformer, SagePreparseTransformer
+
+        from sage.repl.interpreter import SagePreparseTransformer, SagePromptTransformer
 
         self.shell.input_transformer_manager.cleanup_transforms.insert(1, SagePromptTransformer)
         self.shell.input_transformers_post.append(SagePreparseTransformer)