Skip to content

Removed simplejson alias. #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2014
Merged

Removed simplejson alias. #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions filer/admin/clipboardadmin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#-*- coding: utf-8 -*-
import json as simplejson
import json

from django.forms.models import modelform_factory
from django.contrib import admin
Expand Down Expand Up @@ -85,7 +85,7 @@ def ajax_upload(self, request, folder_id=None):
'alt_text': '',
'label': unicode(file_obj),
}
return HttpResponse(simplejson.dumps(json_response),
return HttpResponse(json.dumps(json_response),
mimetype=mimetype)
else:
form_errors = '; '.join(['%s: %s' % (
Expand All @@ -94,7 +94,7 @@ def ajax_upload(self, request, folder_id=None):
])
raise UploadException("AJAX request not valid: form invalid '%s'" % (form_errors,))
except UploadException, e:
return HttpResponse(simplejson.dumps({'error': unicode(e)}),
return HttpResponse(json.dumps({'error': unicode(e)}),
mimetype=mimetype)

def get_model_perms(self, request):
Expand Down