diff options
| author | Tom Christie | 2015-02-09 20:43:50 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-02-09 20:43:50 +0000 | 
| commit | fbb21caaaa01033bbd34b0c63ab48243ffb6310e (patch) | |
| tree | 5d0fdee18c9bf02733b1df913c4cddd9e3e86da7 /rest_framework/serializers.py | |
| parent | 407480b4840990ff17f9a33b293cfcf15bb6f7c5 (diff) | |
| parent | 7b639c0cd0676172cc8502e833f5b708f39f9a83 (diff) | |
| download | django-rest-framework-fbb21caaaa01033bbd34b0c63ab48243ffb6310e.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 7235d8c5..c60574d4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -177,7 +177,7 @@ class BaseSerializer(Field):          )          assert hasattr(self, 'initial_data'), ( -            'Cannot call `.is_valid()` as no `data=` keyword argument was' +            'Cannot call `.is_valid()` as no `data=` keyword argument was '              'passed when instantiating the serializer instance.'          ) @@ -635,11 +635,11 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data):      If we don't do this explicitly they'd get a less helpful error when      calling `.save()` on the serializer. -    We don't *automatically* support these sorts of nested writes brecause +    We don't *automatically* support these sorts of nested writes because      there are too many ambiguities to define a default behavior.      Eg. Suppose we have a `UserSerializer` with a nested profile. How should -    we handle the case of an update, where the `profile` realtionship does +    we handle the case of an update, where the `profile` relationship does      not exist? Any of the following might be valid:      * Raise an application error. | 
