diff options
| author | Tom Christie | 2013-12-09 07:45:45 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-12-09 07:45:45 +0000 |
| commit | 80ef2685e522fc87bd8af9767aa7b231c9991ea4 (patch) | |
| tree | 4be3191af2eec42ffea97443c9e9f11ee5631ca7 /rest_framework/serializers.py | |
| parent | 4e9385e709bcee87456a99839841ecf6b56f337a (diff) | |
| parent | 175b4d233d578b5964db72f91a96bb3b4a0f3e99 (diff) | |
| download | django-rest-framework-80ef2685e522fc87bd8af9767aa7b231c9991ea4.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 163abf4f..44e4b04b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -896,7 +896,10 @@ class ModelSerializer(Serializer): # Update an existing instance... if instance is not None: for key, val in attrs.items(): - setattr(instance, key, val) + try: + setattr(instance, key, val) + except ValueError: + self._errors[key] = self.error_messages['required'] # ...or create a new instance else: |