From 6693d2d277823c9150077c7c9534b7550dfd192c Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 18 Dec 2012 18:21:58 +0000
Subject: Fix for pks returning as strings when set in pre_save.  Fixes #482.
 Thanks to @n8agrin for the bug report.

---
 rest_framework/mixins.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index 1edcfa5c..8dc0c329 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -113,6 +113,10 @@ class UpdateModelMixin(object):
             slug_field = self.get_slug_field()
             setattr(obj, slug_field, slug)
 
+        # Ensure we clean the attributes so that we don't eg return integer
+        # pk using a string representation, as provided by the url conf kwarg.
+        obj.full_clean()
+
 
 class DestroyModelMixin(object):
     """
-- 
cgit v1.2.3


From 598ae3286ac6343a59e6d80fc93428539c5f836e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 19 Dec 2012 22:05:35 +0000
Subject: Fix #521.  (Browseable API exception on delete)

---
 rest_framework/mixins.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index 8dc0c329..2700606d 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -124,6 +124,6 @@ class DestroyModelMixin(object):
     Should be mixed in with `SingleObjectBaseView`.
     """
     def destroy(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        self.object.delete()
+        obj = self.get_object()
+        obj.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
-- 
cgit v1.2.3