aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorTom Christie2012-09-25 13:20:12 +0100
committerTom Christie2012-09-25 13:20:12 +0100
commite0913e29b846a5b6aedc08ef8243ce62e80ecbfd (patch)
tree6504d36635804f7f59c54786751ae45e8a473ad9 /rest_framework/fields.py
parent4fb57d28e60c02593f14ba7cdebed4e478371512 (diff)
downloaddjango-rest-framework-e0913e29b846a5b6aedc08ef8243ce62e80ecbfd.tar.bz2
Fix some bits of serialization
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 2d44a1e1..eab90617 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -42,7 +42,11 @@ class Field(object):
self.source = source
self.readonly = readonly
- self.required = not(readonly)
+ if required is None:
+ self.required = not(readonly)
+ else:
+ assert not readonly, "Cannot set required=True and readonly=True"
+ self.required = required
messages = {}
for c in reversed(self.__class__.__mro__):
@@ -66,9 +70,8 @@ class Field(object):
self.model_field = model_field
def validate(self, value):
- pass
- # if value in validators.EMPTY_VALUES and self.required:
- # raise ValidationError(self.error_messages['required'])
+ if value in validators.EMPTY_VALUES and self.required:
+ raise ValidationError(self.error_messages['required'])
def run_validators(self, value):
if value in validators.EMPTY_VALUES: