]> git.openstreetmap.org Git - osqa.git/blobdiff - forum/utils/decorators.py
Replace deprecated mimetype with content_type
[osqa.git] / forum / utils / decorators.py
index e4e7acb324c8d6ee0c3edb6ddad30cc37b1cd3a9..18a5826bd8eba5cb40159ff7c7b7a116ea4e92d1 100644 (file)
@@ -1,13 +1,13 @@
+import json
 from django.http import HttpResponse, HttpResponseForbidden, Http404
-from django.utils import simplejson
 
 def ajax_login_required(view_func):
     def wrap(request,*args,**kwargs):
         if request.user.is_authenticated():
             return view_func(request,*args,**kwargs)
         else:
-            json = simplejson.dumps({'login_required':True})
-            return HttpResponseForbidden(json,mimetype='application/json')
+            json = json.dumps({'login_required':True})
+            return HttpResponseForbidden(json, content_type='application/json')
     return wrap
 
 def ajax_method(view_func):
@@ -16,10 +16,10 @@ def ajax_method(view_func):
             raise Http404
         retval = view_func(request,*args,**kwargs)
         if isinstance(retval, HttpResponse):
-            retval.mimetype = 'application/json'
+            retval.content_type = 'application/json'
             return retval
         else:
-            json = simplejson.dumps(retval)
-            return HttpResponse(json,mimetype='application/json')
+            json = json.dumps(retval)
+            return HttpResponse(json, content_type='application/json')
     return wrap