diff options
| author | Xavier Ordoquy | 2014-04-30 22:24:01 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-04-30 22:24:01 +0200 |
| commit | 2aca69a94601858a462060bc55154c812f70fb91 (patch) | |
| tree | 86f4d926344bea677ff8dd56505332fc16fdecc8 /rest_framework/fields.py | |
| parent | c5f68fba0638a15fa3c802f1bafc664e890611dc (diff) | |
| parent | d8fb81ceb15afe09a50584afcc466de812d30046 (diff) | |
| download | django-rest-framework-2aca69a94601858a462060bc55154c812f70fb91.tar.bz2 | |
Merge remote-tracking branch 'reference/master' into feature/pytest
Conflicts:
tests/test_serializer.py
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 946a5954..8cdc5551 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -289,7 +289,7 @@ class WritableField(Field): self.validators = self.default_validators + validators self.default = default if default is not None else self.default - # Widgets are ony used for HTML forms. + # Widgets are only used for HTML forms. widget = widget or self.widget if isinstance(widget, type): widget = widget() |