1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
index c93d1f2..838f1a6 100644
--- a/src/sage/doctest/forker.py
+++ b/src/sage/doctest/forker.py
@@ -51,6 +51,7 @@ import tempfile
from dis import findlinestarts
from queue import Empty
import gc
+import IPython.lib.pretty
import sage.misc.randstate as randstate
from .util import Timer, RecordingDict, count_noun
@@ -86,6 +87,32 @@ _OSError_SUBCLASSES = [
exc is not OSError
]
+def _sorted_dict_pprinter_factory(start, end):
+ """
+ Modified version of :func:`IPython.lib.pretty._dict_pprinter_factory`
+ that sorts the keys of dictionaries for printing.
+
+ EXAMPLES::
+
+ sage: {2: 0, 1: 0} # indirect doctest
+ {1: 0, 2: 0}
+ """
+ def inner(obj, p, cycle):
+ if cycle:
+ return p.text('{...}')
+ step = len(start)
+ p.begin_group(step, start)
+ keys = obj.keys()
+ keys = IPython.lib.pretty._sorted_for_pprint(keys)
+ for idx, key in p._enumerate(keys):
+ if idx:
+ p.text(',')
+ p.breakable()
+ p.pretty(key)
+ p.text(': ')
+ p.pretty(obj[key])
+ p.end_group(step, end)
+ return inner
def init_sage():
@@ -185,11 +212,11 @@ def init_sage():
# 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
+ # insertion order, which is preserved in those versions).
+ # However, this order is random in some instances.
+ # Also modifications of code may affect the order.
+ # So here we fore sorted dict printing.
+ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
# Switch on extra debugging
from sage.structure.debug_options import debug
|