summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Ordoquy <xordoquy@linovia.com>2013-12-06 10:43:04 +0100
committerXavier Ordoquy <xordoquy@linovia.com>2013-12-06 10:43:04 +0100
commit6032462a763c9f74779baa63a2f75998c2cef8ad (patch)
treefb5be2ab6b8fc70a3c20e63d2b537b875cbd23e6
parent8c8e262e421fb643ceb6bd02fb9bc7b2579c70a8 (diff)
downloadraven-6032462a763c9f74779baa63a2f75998c2cef8ad.tar.gz
Revert "Fixed the task import for celery 3.1 (thanks to dctrwatson)"
This reverts commit 8c8e262e421fb643ceb6bd02fb9bc7b2579c70a8.
-rw-r--r--raven/contrib/celery/__init__.py3
-rw-r--r--raven/contrib/django/celery/__init__.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/raven/contrib/celery/__init__.py b/raven/contrib/celery/__init__.py
index 8b1dd0c..7faae2b 100644
--- a/raven/contrib/celery/__init__.py
+++ b/raven/contrib/celery/__init__.py
@@ -9,8 +9,7 @@ from __future__ import absolute_import
import logging
try:
- from celery import current_app
- task = current_app.task
+ from celery.contrib.methods import task
except ImportError:
# Import the pre Celery 3.1 tasks (At some point we'll drop that)
try:
diff --git a/raven/contrib/django/celery/__init__.py b/raven/contrib/django/celery/__init__.py
index feabe6c..7aecb85 100644
--- a/raven/contrib/django/celery/__init__.py
+++ b/raven/contrib/django/celery/__init__.py
@@ -10,8 +10,7 @@ from __future__ import absolute_import
from raven.contrib.celery import CeleryMixin
from raven.contrib.django.client import DjangoClient
try:
- from celery import current_app
- task = current_app.task
+ from celery.contrib.methods import task
except ImportError:
# Import the pre Celery 3.1 tasks (At some point we'll drop that)
try: