Merge branch '3.0'

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:

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'),

celery/worker/state.py

@@ -65,6 +65,8 @@ def task_ready(request):
 
 
 C_BENCH = os.environ.get('C_BENCH') or os.environ.get('CELERY_BENCH')
+C_BENCH_EVERY = int(os.environ.get('C_BENCH_EVERY') or
+                    os.environ.get('CELERY_BENCH_EVERY') or 1000)
 if C_BENCH:  # pragma: no cover
     import atexit
 
@@ -76,7 +78,7 @@ if C_BENCH:  # pragma: no cover
     bench_first = None
     bench_start = None
     bench_last = None
-    bench_every = int(os.environ.get('CELERY_BENCH_EVERY', 1000))
+    bench_every = C_BENCH_EVERY
     bench_sample = []
     __reserved = task_reserved
     __ready = task_ready