Browse Source

Removes task_sent signal (use after_task_publish)

Ask Solem 8 years ago
parent
commit
da68f1b1cb
5 changed files with 2 additions and 42 deletions
  1. 0 7
      celery/app/amqp.py
  2. 0 4
      celery/signals.py
  3. 0 19
      docs/internals/deprecation.rst
  4. 0 10
      docs/userguide/signals.rst
  5. 2 2
      docs/whatsnew-3.1.rst

+ 0 - 7
celery/app/amqp.py

@@ -441,9 +441,6 @@ class AMQP:
         send_after_publish = signals.after_task_publish.send
         after_receivers = signals.after_task_publish.receivers
 
-        send_task_sent = signals.task_sent.send   # XXX compat
-        sent_receivers = signals.task_sent.receivers
-
         default_evd = self._event_dispatcher
         default_exchange = self.default_exchange
 
@@ -521,10 +518,6 @@ class AMQP:
             if after_receivers:
                 send_after_publish(sender=name, body=body, headers=headers2,
                                    exchange=exchange, routing_key=routing_key)
-            if sent_receivers:  # XXX deprecated
-                send_task_sent(sender=name, task_id=body['id'], task=name,
-                               args=body['args'], kwargs=body['kwargs'],
-                               eta=body['eta'], taskset=body['taskset'])
             if sent_event:
                 evd = event_dispatcher or default_evd
                 exname = exchange

+ 0 - 4
celery/signals.py

@@ -50,10 +50,6 @@ task_rejected = Signal(providing_args=[
 task_unknown = Signal(providing_args=[
     'message', 'exc', 'name', 'id',
 ])
-#: Deprecated, use after_task_publish instead.
-task_sent = Signal(providing_args=[
-    'task_id', 'task', 'args', 'kwargs', 'eta', 'taskset',
-])
 
 celeryd_init = Signal(providing_args=['instance', 'conf', 'options'])
 celeryd_after_setup = Signal(providing_args=['instance', 'conf'])

+ 0 - 19
docs/internals/deprecation.rst

@@ -166,25 +166,6 @@ Settings
 =====================================  =====================================
 
 
-Task_sent signal
-----------------
-
-The :signal:`task_sent` signal will be removed in version 4.0.
-Please use the :signal:`before_task_publish` and :signal:`after_task_publish`
-signals instead.
-
-Result
-------
-
-Apply to: :class:`~celery.result.AsyncResult`,
-:class:`~celery.result.EagerResult`:
-
-- ``Result.wait()`` -> ``Result.get()``
-
-- ``Result.task_id()`` -> ``Result.id``
-
-- ``Result.status`` -> ``Result.state``.
-
 .. _deprecations-v3.1:
 
 

+ 0 - 10
docs/userguide/signals.rst

@@ -749,13 +749,3 @@ Provides arguments:
 * ``options``
 
     Mapping of the parsed user preload options (with default values).
-
-Deprecated Signals
-------------------
-
-.. signal:: task_sent
-
-``task_sent``
-~~~~~~~~~~~~~
-
-This signal is deprecated, please use :signal:`after_task_publish` instead.

+ 2 - 2
docs/whatsnew-3.1.rst

@@ -1018,10 +1018,10 @@ In Other News
 - New :signal:`before_task_publish` signal dispatched before a task message
   is sent and can be used to modify the final message fields (Issue #1281).
 
-- New :signal:`after_task_publish` signal replaces the old :signal:`task_sent`
+- New :signal:`after_task_publish` signal replaces the old ``task_sent``
   signal.
 
-    The :signal:`task_sent` signal is now deprecated and should not be used.
+    The ``task_sent`` signal is now deprecated and should not be used.
 
 - New :signal:`worker_process_shutdown` signal is dispatched in the
   prefork pool child processes as they exit.