Compatibility with Celery 3.2a1

Author: ask

djcelery/backends/cache.py

@@ -8,7 +8,6 @@
 from django.core.cache import cache, get_cache
 
 from celery import current_app
-from celery.utils.timeutils import timedelta_seconds
 from celery.backends.base import KeyValueStoreBackend
 
 # CELERY_CACHE_BACKEND overrides the django-global(tm) backend settings.
@@ -55,7 +54,7 @@ def __init__(self, *args, **kwargs):
         expires = kwargs.get('expires',
                              current_app.conf.CELERY_TASK_RESULT_EXPIRES)
         if isinstance(expires, timedelta):
-            expires = int(timedelta_seconds(expires))
+            expires = int(max(expires.total_seconds(), 0))
         self.expires = expires
 
     def get(self, key):

djcelery/models.py

@@ -11,7 +11,6 @@
 from celery import schedules
 from celery import states
 from celery.events.state import heartbeat_expires
-from celery.utils.timeutils import timedelta_seconds
 
 from . import managers
 from .picklefield import PickledObjectField
@@ -104,7 +103,7 @@ def schedule(self):
 
     @classmethod
     def from_schedule(cls, schedule, period='seconds'):
-        every = timedelta_seconds(schedule.run_every)
+        every = max(schedule.run_every.total_seconds(), 0)
         try:
             return cls.objects.get(every=every, period=period)
         except cls.DoesNotExist:

djcelery/tests/test_schedulers.py

@@ -5,7 +5,6 @@
 
 from celery.five import monotonic
 from celery.schedules import schedule, crontab
-from celery.utils.timeutils import timedelta_seconds
 
 from djcelery import schedulers
 from djcelery import celery
@@ -245,7 +244,7 @@ def test_PeriodicTask_unicode_crontab(self):
     def test_PeriodicTask_schedule_property(self):
         p1 = create_model_interval(schedule(timedelta(seconds=10)))
         s1 = p1.schedule
-        self.assertEqual(timedelta_seconds(s1.run_every), 10)
+        self.assertEqual(s1.run_every.total_seconds(), 10)
 
         p2 = create_model_crontab(crontab(hour='4, 5',
                                           minute='10,20,30',

djcelery/tests/test_views.py

@@ -186,9 +186,9 @@ def test_retry(self):
 
 class test_task_is_successful(ViewTestCase):
 
-    def assertStatusForIs(self, status, outcome):
+    def assertStatusForIs(self, status, outcome, result=None):
         uuid = gen_unique_id()
-        result = gen_unique_id()
+        result = result or gen_unique_id()
         current_app.backend.store_result(uuid, result, status)
         json = self.client.get(task_is_successful(task_id=uuid))
         self.assertJSONEqual(json, {'task': {'id': uuid,
@@ -201,7 +201,7 @@ def test_pending(self):
         self.assertStatusForIs(states.PENDING, False)
 
     def test_failure(self):
-        self.assertStatusForIs(states.FAILURE, False)
+        self.assertStatusForIs(states.FAILURE, False, KeyError('foo'))
 
     def test_retry(self):
-        self.assertStatusForIs(states.RETRY, False)
+        self.assertStatusForIs(states.RETRY, False, KeyError('foo'))

djcelery/views.py

@@ -7,9 +7,10 @@
 from anyjson import serialize
 
 from celery import states
+from celery.five import keys, items
 from celery.registry import tasks
 from celery.result import AsyncResult
-from celery.utils import get_full_cls_name, kwdict
+from celery.utils import get_full_cls_name
 from celery.utils.encoding import safe_repr
 
 # Ensure built-in tasks are loaded for task_list view
@@ -31,10 +32,11 @@ def task_view(task):
     """
 
     def _applier(request, **options):
-        kwargs = kwdict(request.method == 'POST' and
-                        request.POST or request.GET)
+        kwargs = request.POST if request.method == 'POST' else request.GET
         # no multivalue
-        kwargs = dict(((k, v) for k, v in kwargs.iteritems()), **options)
+        kwargs = {k: v for k, v in items(kwargs)}
+        if options:
+            kwargs.update(options)
         result = task.apply_async(kwargs=kwargs)
         return JsonResponse({'ok': 'true', 'task_id': result.task_id})
 
@@ -67,7 +69,7 @@ def task_status(request, task_id):
     """Returns task status and result in JSON format."""
     result = AsyncResult(task_id)
     state, retval = result.state, result.result
-    response_data = dict(id=task_id, status=state, result=retval)
+    response_data = {'id': task_id, 'status': state, 'result': retval}
     if state in states.EXCEPTION_STATES:
         traceback = result.traceback
         response_data.update({'result': safe_repr(retval),
@@ -78,8 +80,7 @@ def task_status(request, task_id):
 
 def registered_tasks(request):
     """View returning all defined tasks as a JSON object."""
-    return JsonResponse({'regular': tasks.regular().keys(),
-                         'periodic': tasks.periodic().keys()})
+    return JsonResponse({'regular': list(keys(tasks)), 'periodic': ''})
 
 
 def task_webhook(fun):

tests/settings.py

@@ -59,6 +59,10 @@
 
 CELERY_QUEUES = {'testcelery': {'binding_key': 'testcelery'}}
 
+CELERY_ACCEPT_CONTENT = ['pickle', 'json']
+CELERY_TASK_SERIALIZER = 'pickle'
+CELERY_RESULT_SERIALIZER = 'pickle'
+
 MANAGERS = ADMINS
 
 DATABASES = {