Refs #29838, Refs #28507 -- Made make_hashable() ignore key order.

1 files changed, 6 insertions, 1 deletions

diff --git a/django/utils/hashable.py b/django/utils/hashable.py
index 0bef5b003d..7d137ccc2f 100644
--- a/django/utils/hashable.py
+++ b/django/utils/hashable.py
@@ -2,10 +2,15 @@ from django.utils.itercompat import is_iterable
 
 
 def make_hashable(value):
+    """
+    Attempt to make value hashable or raise a TypeError if it fails.
+
+    The returned value should generate the same hash for equal values.
+    """
     if isinstance(value, dict):
         return tuple([
             (key, make_hashable(nested_value))
-            for key, nested_value in value.items()
+            for key, nested_value in sorted(value.items())
         ])
     # Try hash to avoid converting a hashable iterable (e.g. string, frozenset)
     # to a tuple.