diff options
| author | Tom Christie | 2013-11-08 05:22:33 -0800 | 
|---|---|---|
| committer | Tom Christie | 2013-11-08 05:22:33 -0800 | 
| commit | 541871feca8f36a5e8eca07fffd4486149b083fe (patch) | |
| tree | 7d4b44ad561c6170ce743987b95112184170c669 | |
| parent | 97430c0d9c608728eb7dc135b9aac4d5327b9247 (diff) | |
| parent | d4a50429b098656e7a0855c6acf12f0aa4bc434f (diff) | |
| download | django-rest-framework-541871feca8f36a5e8eca07fffd4486149b083fe.tar.bz2 | |
Merge pull request #1216 from linovia/master
Fixed a regression with ValidationError under Django 1.6
| -rw-r--r-- | rest_framework/serializers.py | 9 | 
1 files changed, 7 insertions, 2 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5240dbf6..7cdb55c8 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -42,6 +42,7 @@ def pretty_name(name):  class RelationsList(list):      _deleted = [] +  class NestedValidationError(ValidationError):      """      The default ValidationError behavior is to stringify each item in the list @@ -56,9 +57,13 @@ class NestedValidationError(ValidationError):      def __init__(self, message):          if isinstance(message, dict): -            self.messages = [message] +            self._messages = [message]          else: -            self.messages = message +            self._messages = message + +    @property +    def messages(self): +        return self._messages  class DictWithMetadata(dict):  | 
