aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2012-09-25 13:20:12 +0100
committerTom Christie2012-09-25 13:20:12 +0100
commite0913e29b846a5b6aedc08ef8243ce62e80ecbfd (patch)
tree6504d36635804f7f59c54786751ae45e8a473ad9 /rest_framework/serializers.py
parent4fb57d28e60c02593f14ba7cdebed4e478371512 (diff)
downloaddjango-rest-framework-e0913e29b846a5b6aedc08ef8243ce62e80ecbfd.tar.bz2
Fix some bits of serialization
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 96e46d94..4d5958d2 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -95,7 +95,7 @@ class BaseSerializer(Field):
self.context = context or {}
self.init_data = data
- self.instance = instance
+ self.object = instance
self._data = None
self._errors = None
@@ -247,7 +247,7 @@ class BaseSerializer(Field):
self._errors = {}
attrs = self.restore_fields(data)
if not self._errors:
- return self.restore_object(attrs, instance=getattr(self, 'instance', None))
+ return self.restore_object(attrs, instance=getattr(self, 'object', None))
@property
def errors(self):
@@ -267,7 +267,7 @@ class BaseSerializer(Field):
@property
def data(self):
if self._data is None:
- self._data = self.to_native(self.instance)
+ self._data = self.to_native(self.object)
return self._data