diff options
| author | Xavier Ordoquy | 2014-04-30 22:21:26 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-04-30 22:21:26 +0200 |
| commit | 56b43903162c5f3d64fb32945b87168887d283cc (patch) | |
| tree | 3c58eeb2d76cd689ae2e584f4149720876c938a2 /rest_framework/fields.py | |
| parent | d08536ad9d026fb7126c430f6d9c18f8540aacd6 (diff) | |
| parent | d8fb81ceb15afe09a50584afcc466de812d30046 (diff) | |
| download | django-rest-framework-56b43903162c5f3d64fb32945b87168887d283cc.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 2.4.0
Conflicts:
.travis.yml
rest_framework/serializers.py
rest_framework/tests/test_authentication.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 533de28c..8eaf763d 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -284,7 +284,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() |