On Python 3.6 dicts retain insertion order, so, keys are no longer sorted in such cases when printing. Fixes #566

Author: fabioz

src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_safe_repr.py

@@ -4,7 +4,7 @@
 
 # Gotten from ptvsd for supporting the format expected there.
 import sys
-from _pydevd_bundle.pydevd_constants import IS_PY2
+from _pydevd_bundle.pydevd_constants import IS_PY2, IS_PY36_OR_GREATER
 import locale
 from _pydev_bundle import pydev_log
 
@@ -248,10 +248,15 @@ def _repr_dict(self, obj, level, prefix, suffix,
         count = self.maxcollection[level]
         yield_comma = False
 
-        try:
-            sorted_keys = sorted(obj)
-        except Exception:
+        if IS_PY36_OR_GREATER:
+            # On Python 3.6 (onwards) dictionaries now keep
+            # insertion order.
             sorted_keys = list(obj)
+        else:
+            try:
+                sorted_keys = sorted(obj)
+            except Exception:
+                sorted_keys = list(obj)
 
         for key in sorted_keys:
             if yield_comma:

src/debugpy/_vendored/pydevd/tests_python/test_safe_repr.py

@@ -5,7 +5,7 @@
 import pytest
 from _pydevd_bundle.pydevd_safe_repr import SafeRepr
 import json
-from _pydevd_bundle.pydevd_constants import IS_JYTHON, IS_PY2
+from _pydevd_bundle.pydevd_constants import IS_JYTHON, IS_PY2, IS_PY36_OR_GREATER
 
 try:
     import numpy as np
@@ -400,7 +400,10 @@ def test_sorted(self):
         d1['c'] = None
         d1['b'] = None
         d1['a'] = None
-        self.assert_saferepr(d1, "{'a': None, 'b': None, 'c': None}")
+        if IS_PY36_OR_GREATER:
+            self.assert_saferepr(d1, "{'c': None, 'b': None, 'a': None}")
+        else:
+            self.assert_saferepr(d1, "{'a': None, 'b': None, 'c': None}")
 
     @pytest.mark.skipif(sys.version_info < (3, 0), reason='Py3 specific test')
     def test_unsortable_keys(self):