diff options
| author | Steven Cummings | 2014-01-02 17:18:08 -0600 |
|---|---|---|
| committer | Steven Cummings | 2014-01-02 17:18:08 -0600 |
| commit | e020c51b44b9acecdb01cc90f2d6da977ba5ea0f (patch) | |
| tree | 350a4cefd0f50918e6a01a219c0e775e27d8e45b /rest_framework/serializers.py | |
| parent | 12d1544101e415fe473471eb8c6a2d7aeccd9112 (diff) | |
| download | django-rest-framework-e020c51b44b9acecdb01cc90f2d6da977ba5ea0f.tar.bz2 | |
FIX BaseSerializer.from_native has an altered signature
* base classes define it with one parameter
* BaseSerializer currently defines a second parameter, which we make optional here for method-dispatch passivity
Diffstat (limited to 'rest_framework/serializers.py')
| -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. """ |