summarylogtreecommitdiffstats
path: root/sagemath-ipython7.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sagemath-ipython7.patch')
-rw-r--r--sagemath-ipython7.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/sagemath-ipython7.patch b/sagemath-ipython7.patch
index 03aa03d4cca4..2af60a47d285 100644
--- a/sagemath-ipython7.patch
+++ b/sagemath-ipython7.patch
@@ -1,3 +1,23 @@
+diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
+index d1e8bf7388..557fbb2942 100644
+--- a/src/sage/doctest/forker.py
++++ b/src/sage/doctest/forker.py
+@@ -183,15 +183,6 @@ def init_sage():
+ from sage.repl.rich_output.backend_doctest import BackendDoctest
+ dm.switch_backend(BackendDoctest())
+
+- # IPython's pretty printer sorts the repr of dicts by their keys by default
+- # (or their keys' str() if they are not otherwise orderable). However, it
+- # disables this for CPython 3.6+ opting to instead display dicts' "natural"
+- # insertion order, which is preserved in those versions). This makes for
+- # inconsistent results with Python 2 tests that return dicts, so here we
+- # force the Python 2 style dict printing
+- import IPython.lib.pretty
+- IPython.lib.pretty.DICT_IS_ORDERED = False
+-
+ # Switch on extra debugging
+ from sage.structure.debug_options import debug
+ debug.refine_category_hash_check = True
diff --git a/src/sage/algebras/cluster_algebra.py b/src/sage/algebras/cluster_algebra.py
index 4054bd5d9a..236b861c8a 100644
--- a/src/sage/algebras/cluster_algebra.py