Merge pull request nanvel#3 from alekzvik/patch-1

Made simplejson optional
MetalBlazer · Feb 7, 2015 · a26cfc0 · a26cfc0
2 parents 2a13d50 + fc51733
commit a26cfc0
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/nicedit/views.py b/nicedit/views.py
@@ -1,19 +1,22 @@
-from django.utils import simplejson
+try:
+    from django.utils import simplejson as json
+except ImportError:
+    import json
 from django.http import HttpResponse
 
 from .forms import NicEditImageForm
 
 
 def upload(request):
     if not request.user.is_authenticated():
-        json = simplejson.dumps({
+        json_data = json.dumps({
             'success': False,
             'errors': {'__all__': 'Authentication required'}})
-        return HttpResponse(json, mimetype='application/json')
+        return HttpResponse(json_data, mimetype='application/json')
     form = NicEditImageForm(request.POST or None, request.FILES or None)
     if form.is_valid():
         image = form.save()
-        json = simplejson.dumps({
+        json_data = json.dumps({
             'success': True,
             'upload': {
                 'links': {
@@ -24,6 +27,6 @@ def upload(request):
             }
         })
     else:
-        json = simplejson.dumps({
+        json_data = json.dumps({
             'success': False, 'errors': form.errors})
-    return HttpResponse(json, mimetype='application/json')
+    return HttpResponse(json_data, mimetype='application/json')