Skip to content

Commit 6bef9fb

Browse files
committed
Use json from standard python 2.6 library
Fix Django 1.6 deprecation warning
1 parent 194ff88 commit 6bef9fb

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

polymorphic_tree/admin/parentadmin.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
from django.core.urlresolvers import reverse
33
from django.db.transaction import commit_on_success
44
from django.http import HttpResponseNotFound, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect
5-
from django.utils import simplejson
65
from django.utils.translation import ugettext_lazy as _
76
from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicModelChoiceForm
87
from polymorphic_tree.models import PolymorphicMPTTModel
98
from mptt.admin import MPTTModelAdmin
9+
import json
1010

1111
try:
1212
# Django 1.6 requires this
@@ -173,18 +173,18 @@ def api_node_moved_view(self, request):
173173
moved = self.model.objects.get(pk=moved_id)
174174
target = self.model.objects.get(pk=target_id)
175175
except (ValueError, KeyError) as e:
176-
return HttpResponseBadRequest(simplejson.dumps({'action': 'foundbug', 'error': str(e[0])}), content_type='application/json')
176+
return HttpResponseBadRequest(json.dumps({'action': 'foundbug', 'error': str(e[0])}), content_type='application/json')
177177
except self.model.DoesNotExist as e:
178-
return HttpResponseNotFound(simplejson.dumps({'action': 'reload', 'error': str(e[0])}), content_type='application/json')
178+
return HttpResponseNotFound(json.dumps({'action': 'reload', 'error': str(e[0])}), content_type='application/json')
179179

180180
if not self.can_have_children(target) and position == 'inside':
181-
return HttpResponse(simplejson.dumps({
181+
return HttpResponse(json.dumps({
182182
'action': 'reject',
183183
'moved_id': moved_id,
184184
'error': _(u'Cannot place \u2018{0}\u2019 below \u2018{1}\u2019; a {2} does not allow children!').format(moved, target, target._meta.verbose_name)
185185
}), content_type='application/json', status=409) # Conflict
186186
if moved.parent_id != previous_parent_id:
187-
return HttpResponse(simplejson.dumps({
187+
return HttpResponse(json.dumps({
188188
'action': 'reload',
189189
'error': 'Client seems to be out-of-sync, please reload!'
190190
}), content_type='application/json', status=409)
@@ -205,7 +205,7 @@ def api_node_moved_view(self, request):
205205
moved.save()
206206

207207
# Report back to client.
208-
return HttpResponse(simplejson.dumps({
208+
return HttpResponse(json.dumps({
209209
'action': 'success',
210210
'error': None,
211211
'moved_id': moved_id,

0 commit comments

Comments
 (0)