Merge branch 'master' of github.com:nanvel/django-nicedit

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')

setup.py

@@ -47,7 +47,7 @@ def read(fname):
     platforms=['OS Independent'],
     keywords='django, nicedit, widget, rte',
     author='Oleksandr Polyeno',
-    author_email='polyeno.com',
+    author_email='polyenoom@gmail.com',
     url="https://github.com/nanvel/django-nicedit",
     packages=find_packages(),
     include_package_data=True,