From 217f82d7139fd32f07adbfa92c5fb383d0ade577 Mon Sep 17 00:00:00 2001 From: aspalding Date: Tue, 16 Oct 2018 10:02:36 -0500 Subject: Refs #29838 -- Fixed make_hashable() for values that have lists or dicts nested in tuples. And for non-hashable values that are iterable, e.g. sets. --- django/utils/hashable.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'django/utils') diff --git a/django/utils/hashable.py b/django/utils/hashable.py index 859ea8073e..0bef5b003d 100644 --- a/django/utils/hashable.py +++ b/django/utils/hashable.py @@ -1,9 +1,19 @@ +from django.utils.itercompat import is_iterable + + def make_hashable(value): - if isinstance(value, list): - return tuple(map(make_hashable, value)) if isinstance(value, dict): return tuple([ (key, make_hashable(nested_value)) for key, nested_value in value.items() ]) + # Try hash to avoid converting a hashable iterable (e.g. string, frozenset) + # to a tuple. + try: + hash(value) + except TypeError: + if is_iterable(value): + return tuple(map(make_hashable, value)) + # Non-hashable, non-iterable. + raise return value -- cgit v1.3