mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Fixed #24008 -- Fixed ValidationError crash with list of dicts.

Browse Source 
Backport of 7a878ca5cb from master
This commit is contained in:
Andrey Maslov
2014-12-23 17:51:36 +02:00
committed by Tim Graham
parent 4abfa73c18
commit 8de2a44064
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/core/exceptions.py
View File

@@ -118,7 +118,10 @@ class ValidationError(Exception):
# Normalize plain strings to instances of ValidationError.
if not isinstance(message, ValidationError):
message = ValidationError(message)
self.error_list.extend(message.error_list)
if hasattr(message, 'error_dict'):
self.error_list.extend(sum(message.error_dict.values(), []))
else:
self.error_list.extend(message.error_list)
else:
self.message = message