Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0

This commit is contained in:
Tom Christie 2014-10-15 13:35:23 +01:00
commit 22b27cbdc4

View File

@ -518,7 +518,7 @@ The `MultipleChoiceField` class has been added. This field acts like `ChoiceFiel
#### Changes to the custom field API. #### Changes to the custom field API.
The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_representation(self, value)` and `to_internal_value(self, data)`. The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_internal_value(self, data)` and `to_representation(self, value)`.
The `field_from_native()` and `field_to_native()` methods are removed. The `field_from_native()` and `field_to_native()` methods are removed.