Cosmetics

celery/app/defaults.py

@@ -69,7 +69,6 @@ NAMESPACES = {
         "DEFAULT_EXCHANGE_TYPE": Option("direct"),
         "DEFAULT_DELIVERY_MODE": Option(2, type="string"),
         "EAGER_PROPAGATES_EXCEPTIONS": Option(False, type="bool"),
-        "EAGER_RERAISES_EXCEPTIONS": Option(False, type="bool"),
         "EVENT_SERIALIZER": Option("json"),
         "IMPORTS": Option((), type="tuple"),
         "IGNORE_RESULT": Option(False, type="bool"),

celery/execute/trace.py

@@ -82,7 +82,7 @@ class TaskTrace(object):
 
     def _trace(self):
         trace = TraceInfo.trace(self.task, self.args, self.kwargs,
-                propagate=self.propagate)
+                                propagate=self.propagate)
         self.status = trace.status
         self.strtb = trace.strtb
         self.handle_after_return(trace.status, trace.retval,

celery/tests/test_task.py

@@ -440,13 +440,6 @@ class TestTaskApply(unittest.TestCase):
         finally:
             RaisingTask.app.conf.CELERY_EAGER_PROPAGATES_EXCEPTIONS = False
 
-    def test_apply_with_CELERY_EAGER_RERAISES_EXCEPTIONS(self):
-        RaisingTask.app.conf.CELERY_EAGER_RERAISES_EXCEPTIONS = True
-        try:
-            self.assertRaises(KeyError, RaisingTask.apply)
-        finally:
-            RaisingTask.app.conf.CELERY_EAGER_RERAISES_EXCEPTIONS = False
-
     def test_apply(self):
         IncrementCounterTask.count = 0
 

docs/configuration.rst

@@ -622,17 +622,6 @@ If this is :const:`True`, eagerly executed tasks (using `.apply`, or with
 
 It's the same as always running `apply` with `throw=True`.
 
-.. setting:: CELERY_EAGER_RERAISES_EXCEPTIONS
-
-CELERY_EAGER_RERAISES_EXCEPTIONS
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If this is :const:`True`, eagerly executed tasks (using `.apply`, or with
-:setting:`CELERY_ALWAYS_EAGER` on), will re-raise exceptions with a full
-application traceback.
-
-It's the same as always running `apply` with `reraise_exceptions=True`.
-
 .. setting:: CELERY_IGNORE_RESULT
 
 CELERY_IGNORE_RESULT