diff options
| author | Tom Christie | 2014-01-02 23:27:26 -0800 |
|---|---|---|
| committer | Tom Christie | 2014-01-02 23:27:26 -0800 |
| commit | c3f8c8ffde21562579d9a71e7b6736453ee79f97 (patch) | |
| tree | f6103840355a32a0061650c1ddba8f0e58899730 | |
| parent | 4caa9416e50edf3f9d73ed5dadbd3e86ae6c65ed (diff) | |
| parent | e020c51b44b9acecdb01cc90f2d6da977ba5ea0f (diff) | |
| download | django-rest-framework-c3f8c8ffde21562579d9a71e7b6736453ee79f97.tar.bz2 | |
Merge pull request #1329 from estebistec/fix-serializer-from-native-sig
FIX BaseSerializer.from_native has an altered signature
| -rw-r--r-- | rest_framework/serializers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c0c810ab..b22ca578 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -331,7 +331,7 @@ class BaseSerializer(WritableField): return ret - def from_native(self, data, files): + def from_native(self, data, files=None): """ Deserialize primitives -> objects. """ |