Merge branch 'fix-output-order-dictionary-keys' of https://github.com/ritvi-alagusankar/pytest into fix-output-order-dictionary-keys

Author: ritvi-alagusankar

src/_pytest/_io/pprint.py

@@ -75,7 +75,7 @@ def __init__(
 
         depth
             The maximum depth to print out nested structures.
-        
+
         sort_dicts
             If true, dict keys are sorted.
 

src/_pytest/assertion/util.py

@@ -530,7 +530,11 @@ def _compare_eq_dict(
             f"Left contains {len_extra_left} more item{'' if len_extra_left == 1 else 's'}:"
         )
         explanation.extend(
-            highlighter(pprint.pformat({k: left[k] for k in left if k in extra_left}, sort_dicts=False)).splitlines()
+            highlighter(
+                pprint.pformat(
+                    {k: left[k] for k in left if k in extra_left}, sort_dicts=False
+                )
+            ).splitlines()
         )
     extra_right = set_right - set_left
     len_extra_right = len(extra_right)
@@ -539,7 +543,11 @@ def _compare_eq_dict(
             f"Right contains {len_extra_right} more item{'' if len_extra_right == 1 else 's'}:"
         )
         explanation.extend(
-            highlighter(pprint.pformat({k: right[k] for k in right if k in extra_right}, sort_dicts=False)).splitlines()
+            highlighter(
+                pprint.pformat(
+                    {k: right[k] for k in right if k in extra_right}, sort_dicts=False
+                )
+            ).splitlines()
         )
     return explanation
 

testing/test_error_diffs.py

@@ -208,14 +208,14 @@ def test_this():
         """
         >       assert result == expected
         E       AssertionError: assert {'d': 4, 'c': 3, 'b': 2, 'a': 1} == {'d': 4, 'c': 3, 'e': 5}
-        E         
+        E
         E         Common items:
         E         {'d': 4, 'c': 3}
         E         Left contains 2 more items:
         E         {'b': 2, 'a': 1}
         E         Right contains 1 more item:
         E         {'e': 5}
-        E         
+        E
         E         Full diff:
         E           {
         E               'd': 4,
@@ -239,15 +239,15 @@ def test_this():
         """
         >       assert result == expected
         E       AssertionError: assert {'c': 3, 'd': 4, 'b': 2, 'a': 1} == {'d': 5, 'c': 3, 'b': 1}
-        E         
+        E
         E         Common items:
         E         {'c': 3}
         E         Differing items:
         E         {'d': 4} != {'d': 5}
         E         {'b': 2} != {'b': 1}
         E         Left contains 1 more item:
         E         {'a': 1}
-        E         
+        E
         E         Full diff:
         E           {
         E         -     'd': 5,