mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-04 07:46:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed ModelState breaking when unique_together has unhashable elements.

Browse source
This commit is contained in:
Baptiste Mispelon 2013-12-06 15:05:12 +01:00
parent 54d9e3ccf6
commit 19e4374971
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
django/db/models/options.py
View file

@ -32,10 +32,13 @@ def normalize_unique_together(unique_together):
tuple of two strings. Normalize it to a tuple of tuples, so that
calling code can uniformly expect that.
"""
unique_together = tuple(unique_together)
if unique_together and not isinstance(unique_together[0], (tuple, list)):
if not unique_together:
return ()
first_element = next(iter(unique_together))
if not isinstance(first_element, (tuple, list)):
unique_together = (unique_together,)
return unique_together
# Normalize everything to tuples
return tuple(tuple(ut) for ut in unique_together)
@python_2_unicode_compatible