Add request argument to render_to_json function

django_ajax/decorators.py

@@ -65,9 +65,9 @@ def inner(request, *args, **kwargs):
             if request.is_ajax():
                 # return json response
                 try:
-                    return render_to_json(func(request, *args, **kwargs), **ajax_kwargs)
+                    return render_to_json(func(request, *args, **kwargs), request, **ajax_kwargs)
                 except Exception as exception:
-                    return render_to_json(exception, **{'request': request})
+                    return render_to_json(exception, request)
             else:
                 # return standard response
                 return func(request, *args, **kwargs)

django_ajax/encoder.py

@@ -55,7 +55,7 @@ class LazyJSONEncoder(LazyJSONEncoderMixin, json.JSONEncoder):
     pass
 
 
-def serialize_to_json(data, *args, **kwargs):
+def serialize_to_json(data, **kwargs):
     """
     A wrapper for simplejson.dumps with defaults as:
 

django_ajax/response.py

@@ -14,7 +14,7 @@ class JSONResponse(HttpResponse):
     Return a JSON serialized HTTP response
     """
 
-    def __init__(self, data, *args, **kwargs):
+    def __init__(self, data, **kwargs):
         """
         This returns a object that we send as json content using
         utils.serialize_to_json, that is a wrapper to json.dumps
@@ -26,6 +26,6 @@ def __init__(self, data, *args, **kwargs):
             kwargs['sort_keys'] = settings.DEBUG
 
         super(JSONResponse, self).__init__(
-            content=serialize_to_json(data, *args, **kwargs),
+            content=serialize_to_json(data, **kwargs),
             content_type='application/json'
         )

django_ajax/shortcuts.py

@@ -76,7 +76,7 @@
 }
 
 
-def render_to_json(response, *args, **kwargs):
+def render_to_json(response, request=None, **kwargs):
     """
     Creates the main structure and returns the JSON response.
     """
@@ -87,7 +87,7 @@ def render_to_json(response, *args, **kwargs):
         status_code = 404
     elif issubclass(type(response), Exception):
         status_code = 500
-        logger.exception(str(response), extra={'request': kwargs.pop('request', None)})
+        logger.exception(str(response), extra={'request': request})
 
         if settings.DEBUG:
             import sys
@@ -106,5 +106,5 @@ def render_to_json(response, *args, **kwargs):
         'content': response
     }
 
-    return JSONResponse(data,  *args, **kwargs)
+    return JSONResponse(data, **kwargs)