aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/mixins.py
diff options
context:
space:
mode:
authorGitHub Merge Button2011-07-01 00:25:37 -0700
committerGitHub Merge Button2011-07-01 00:25:37 -0700
commitdc9960f770c6f6984ce30e3997d1db0d60829d51 (patch)
treec3eaa03a47bc84eb2f89324cf30e57cfd0fa3e3f /djangorestframework/mixins.py
parent8bafa01abd9bcc104aa413f09ab9505abb3526a2 (diff)
parent60cd5363ab1343260c4ed8322d2d26064d56c3d3 (diff)
downloaddjango-rest-framework-dc9960f770c6f6984ce30e3997d1db0d60829d51.tar.bz2
Merge 60cd5363ab1343260c4ed8322d2d26064d56c3d3 into 8bafa01abd9bcc104aa413f09ab9505abb3526a2
Diffstat (limited to 'djangorestframework/mixins.py')
-rw-r--r--djangorestframework/mixins.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index 1b3aa241..3d74ae19 100644
--- a/djangorestframework/mixins.py
+++ b/djangorestframework/mixins.py
@@ -491,17 +491,17 @@ class ReadModelMixin(object):
try:
if args:
# If we have any none kwargs then assume the last represents the primrary key
- instance = model.objects.get(pk=args[-1], **kwargs)
+ self.model_instance = model.objects.get(pk=args[-1], **kwargs)
else:
# Otherwise assume the kwargs uniquely identify the model
filtered_keywords = kwargs.copy()
if BaseRenderer._FORMAT_QUERY_PARAM in filtered_keywords:
del filtered_keywords[BaseRenderer._FORMAT_QUERY_PARAM]
- instance = model.objects.get(**filtered_keywords)
+ self.model_instance = model.objects.get(**filtered_keywords)
except model.DoesNotExist:
raise ErrorResponse(status.HTTP_404_NOT_FOUND)
- return instance
+ return self.model_instance
class CreateModelMixin(object):
@@ -540,19 +540,19 @@ class UpdateModelMixin(object):
try:
if args:
# If we have any none kwargs then assume the last represents the primrary key
- instance = model.objects.get(pk=args[-1], **kwargs)
+ self.model_instance = model.objects.get(pk=args[-1], **kwargs)
else:
# Otherwise assume the kwargs uniquely identify the model
- instance = model.objects.get(**kwargs)
+ self.model_instance = model.objects.get(**kwargs)
for (key, val) in self.CONTENT.items():
- setattr(instance, key, val)
+ setattr(self.model_instance, key, val)
except model.DoesNotExist:
- instance = model(**self.CONTENT)
- instance.save()
+ self.model_instance = model(**self.CONTENT)
+ self.model_instance.save()
- instance.save()
- return instance
+ self.model_instance.save()
+ return self.model_instance
class DeleteModelMixin(object):