Browse Source

Task classes inheriting 'from celery import Task' should not use accept_magic_kwargs

Ask Solem 12 years ago
parent
commit
a8d4123253
2 changed files with 2 additions and 2 deletions
  1. 1 2
      celery/app/task.py
  2. 1 0
      celery/task/base.py

+ 1 - 2
celery/app/task.py

@@ -156,7 +156,7 @@ class Task(object):
 
     #: If disabled the worker will not forward magic keyword arguments.
     #: Deprecated and scheduled for removal in v4.0.
-    accept_magic_kwargs = None
+    accept_magic_kwargs = False
 
     #: Maximum number of retries before giving up.  If set to :const:`None`,
     #: it will **never** stop retrying.
@@ -257,7 +257,6 @@ class Task(object):
         for attr_name, config_name in self.from_config:
             if getattr(self, attr_name, None) is None:
                 setattr(self, attr_name, conf[config_name])
-        self.accept_magic_kwargs = app.accept_magic_kwargs
         if self.accept_magic_kwargs is None:
             self.accept_magic_kwargs = app.accept_magic_kwargs
         if self.backend is None:

+ 1 - 0
celery/task/base.py

@@ -47,6 +47,7 @@ class Task(BaseTask):
     type = 'regular'
     error_whitelist = ()
     disable_error_emails = False
+    accept_magic_kwargs = None  # get default from app
 
     from_config = BaseTask.from_config + (
         ('exchange_type', 'CELERY_DEFAULT_EXCHANGE_TYPE'),