Merge pull request #1329 from estebistec/fix-serializer-from-native-sig

FIX BaseSerializer.from_native has an altered signature

Merge pull request #1329 from estebistec/fix-serializer-from-native-sig
FIX BaseSerializer.from_native has an altered signature
c3f8c8ff · Tom Christie · 4caa9416 · e020c51b · c3f8c8ff
Commit c3f8c8ff authored Jan 02, 2014 by Tom Christie
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

rest_framework/serializers.py
+1 -1

No files found.
--- 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.
        """