Browse Source

Remove dependency to simplejson

Ask Solem 16 years ago
parent
commit
739462d804
2 changed files with 3 additions and 4 deletions
  1. 3 3
      celery/views.py
  2. 0 1
      setup.py

+ 3 - 3
celery/views.py

@@ -2,13 +2,13 @@
 from django.http import HttpResponse
 from celery.task import is_done, delay_task
 from celery.result import AsyncResult
-import simplejson
+from carrot.serialization import serialize as JSON_dump
 
 
 def is_task_done(request, task_id):
     """Returns task execute status in JSON format."""
     response_data = {"task": {"id": task_id, "executed": is_done(task_id)}}
-    return HttpResponse(simplejson.dumps(response_data))
+    return HttpResponse(JSON_dump(response_data))
 
 
 def task_status(request, task_id):
@@ -19,4 +19,4 @@ def task_status(request, task_id):
                         "status": async_result.status,
                         "result": async_result.result,
     }}
-    return HttpResponse(simplejson.dumps(response_data))
+    return HttpResponse(JSON_dump(response_data))

+ 0 - 1
setup.py

@@ -63,7 +63,6 @@ setup(
     scripts=["bin/celeryd"],
     zip_safe=False,
     install_requires=[
-        'simplejson',
         'carrot>=0.4.1',
         'django',
     ],