diff options
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/fields.py | 8 | ||||
| -rw-r--r-- | rest_framework/tests/test_fields.py | 14 |
2 files changed, 18 insertions, 4 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 30bbafc4..535aa2ac 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -250,9 +250,6 @@ class WritableField(Field): self.validators = self.default_validators + validators self.default = default if default is not None else self.default - if is_simple_callable(self.default): - self.default = self.default() - # Widgets are ony used for HTML forms. widget = widget or self.widget if isinstance(widget, type): @@ -298,7 +295,10 @@ class WritableField(Field): except KeyError: if self.default is not None and not self.partial: # Note: partial updates shouldn't set defaults - native = self.default + if is_simple_callable(self.default): + native = self.default() + else: + native = self.default else: if self.required: raise ValidationError(self.error_messages['required']) diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index 3f956051..de371001 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -852,3 +852,17 @@ class FieldMetadata(TestCase): def test_label(self): for field in (self.required_field, self.optional_field): self.assertEqual(field.metadata()['label'], field.label) + + +class FieldCallableDefault(TestCase): + def setUp(self): + self.simple_callable = lambda: 'foo bar' + + def test_default_can_be_simple_callable(self): + """ + Ensure that the 'default' argument can also be a simple callable. + """ + field = serializers.WritableField(default=self.simple_callable) + into = {} + field.field_from_native({}, {}, 'field', into) + self.assertEquals(into, {'field': 'foo bar'}) |