Refactor our displayhook IPython integration

sagemath · Sep 18, 2014 · eb6a66b · eb6a66b
1 parent a246e17
commit eb6a66b
Show file tree

Hide file tree

Showing 14 changed files with 1,083 additions and 600 deletions.
diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
@@ -100,8 +100,8 @@ def init_sage():
     sage.doctest.DOCTEST_MODE=True
     import sage.all_cmdline
     sage.interfaces.quit.invalidate_all()
-    import sage.misc.displayhook
-    sys.displayhook = sage.misc.displayhook.DisplayHook()
+    import sage.repl.display.python_hook
+    sys.displayhook = sage.repl.display.python_hook.DoctestDisplayHook()
 
     # Switch on extra debugging
     from sage.structure.debug_options import debug

diff --git a/src/sage/groups/matrix_gps/matrix_group.py b/src/sage/groups/matrix_gps/matrix_group.py
@@ -230,7 +230,7 @@ def _repr_(self):
             return 'Matrix group over {0} with {1} generators'.format(
                 self.base_ring(), self.ngens())
         else:
-            from sage.misc.displayhook import format_list
+            from sage.repl.display.util import format_list
             return 'Matrix group over {0} with {1} generators {2}'.format(
                 self.base_ring(), self.ngens(), format_list(self.gens()))