Merge pull request #42 from aniketschneider/validation-email-template

[osqa.git] / forum / utils / decorators.py

diff --git a/forum/utils/decorators.py b/forum/utils/decorators.py
index e4e7acb324c8d6ee0c3edb6ddad30cc37b1cd3a9..6cc2d5bd9848852bf22c551ed519ddb7657c29d6 100644 (file)
--- a/forum/utils/decorators.py
+++ b/forum/utils/decorators.py
@@ -1,13 +1,13 @@
+import json

 from django.http import HttpResponse, HttpResponseForbidden, Http404
 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:
 
 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, mimetype='application/json')

     return wrap
 
 def ajax_method(view_func):
     return wrap
 
 def ajax_method(view_func):


@@ -19,7 +19,7 @@ def ajax_method(view_func):
             retval.mimetype = 'application/json'
             return retval
         else:
             retval.mimetype = 'application/json'
             return retval
         else:

-            json = simplejson.dumps(retval)
-            return HttpResponse(json,mimetype='application/json')
+            json = json.dumps(retval)
+            return HttpResponse(json, mimetype='application/json')

     return wrap
             
     return wrap