diff options
| author | Mark Aaron Shirley | 2012-12-19 14:37:44 -0800 |
|---|---|---|
| committer | Mark Aaron Shirley | 2012-12-19 14:37:44 -0800 |
| commit | ae6ca7456feda199124eb78f7872f969fa67d7b8 (patch) | |
| tree | 60ef0e77fa0fbe8af097b36e9f83a3474d17ae8e | |
| parent | c6a6d7ac15b351e2d81685abefd44542367b6e6f (diff) | |
| parent | c29b08ad43c8de5f295176eaf0270427f3a737f3 (diff) | |
| download | django-rest-framework-ae6ca7456feda199124eb78f7872f969fa67d7b8.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-serializers
| -rw-r--r-- | docs/topics/release-notes.md | 1 | ||||
| -rw-r--r-- | rest_framework/mixins.py | 4 | ||||
| -rw-r--r-- | rest_framework/tests/renderers.py | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 87aaefbd..c75f0879 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -8,6 +8,7 @@ ### Master +* Bugfix: Fix exception in browseable API on DELETE. * Bugfix: Fix issue where pk was was being set to a string if set by URL kwarg. ### 2.1.11 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) diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py index 9be4b114..fb843676 100644 --- a/rest_framework/tests/renderers.py +++ b/rest_framework/tests/renderers.py @@ -444,19 +444,19 @@ class CacheRenderTest(TestCase): return if state == None: return - if isinstance(state,tuple): - if not isinstance(state[0],dict): - state=state[1] + if isinstance(state, tuple): + if not isinstance(state[0], dict): + state = state[1] else: - state=state[0].update(state[1]) + state = state[0].update(state[1]) result = {} for i in state: try: - pickle.dumps(state[i],protocol=2) + pickle.dumps(state[i], protocol=2) except pickle.PicklingError: if not state[i] in seen: seen.append(state[i]) - result[i] = cls._get_pickling_errors(state[i],seen) + result[i] = cls._get_pickling_errors(state[i], seen) return result def http_resp(self, http_method, url): |