Renames celery.worker.job -> celery.worker.request

celery/app/trace.py

@@ -530,9 +530,9 @@ def setup_worker_optimizations(app):
     ]
 
     trace_task_ret = _fast_trace_task
-    from celery.worker import job as job_module
-    job_module.trace_task_ret = _fast_trace_task
-    job_module.__optimize__()
+    from celery.worker import request as request_module
+    request_module.trace_task_ret = _fast_trace_task
+    request_module.__optimize__()
 
 
 def reset_worker_optimizations():
@@ -546,8 +546,8 @@ def reset_worker_optimizations():
         BaseTask.__call__ = _patched.pop('BaseTask.__call__')
     except KeyError:
         pass
-    from celery.worker import job as job_module
-    job_module.trace_task_ret = _trace_task_ret
+    from celery.worker import request as request_module
+    request_module.trace_task_ret = _trace_task_ret
 
 
 def _install_stack_protection():

celery/contrib/batches.py

@@ -88,7 +88,7 @@ from itertools import count
 from celery.task import Task
 from celery.five import Empty, Queue
 from celery.utils.log import get_logger
-from celery.worker.job import Request
+from celery.worker.request import Request
 from celery.utils import noop
 
 __all__ = ['Batches']

celery/tests/worker/test_control.py

@@ -16,7 +16,7 @@ from celery.worker import WorkController as _WC
 from celery.worker import consumer
 from celery.worker import control
 from celery.worker import state as worker_state
-from celery.worker.job import Request
+from celery.worker.request import Request
 from celery.worker.state import revoked
 from celery.worker.control import Panel
 from celery.worker.pidbox import Pidbox, gPidbox

celery/tests/worker/test_request.py

@@ -35,8 +35,8 @@ from celery.exceptions import (
 from celery.five import monotonic
 from celery.signals import task_revoked
 from celery.utils import uuid
-from celery.worker import job as module
-from celery.worker.job import Request, logger as req_logger
+from celery.worker import request as module
+from celery.worker.request import Request, logger as req_logger
 from celery.worker.state import revoked
 
 from celery.tests.case import (
@@ -247,7 +247,7 @@ class test_Request(AppCase):
             self.get_request(self.add.s(2, 2).set(expires='12345'))
 
     def test_valid_expires_with_utc_makes_aware(self):
-        with patch('celery.worker.job.maybe_make_aware') as mma:
+        with patch('celery.worker.request.maybe_make_aware') as mma:
             self.get_request(self.add.s(2, 2).set(expires=10))
             self.assertTrue(mma.called)
 
@@ -592,8 +592,8 @@ class test_Request(AppCase):
         with self.assertRaises(InvalidTaskError):
             raise req.execute().exception
 
-    @patch('celery.worker.job.error')
-    @patch('celery.worker.job.warn')
+    @patch('celery.worker.request.error')
+    @patch('celery.worker.request.warn')
     def test_on_timeout(self, warn, error):
 
         job = self.xRequest()

celery/tests/worker/test_worker.py

@@ -24,7 +24,7 @@ from celery.utils import uuid
 from celery.worker import components
 from celery.worker import consumer
 from celery.worker.consumer import Consumer as __Consumer
-from celery.worker.job import Request
+from celery.worker.request import Request
 from celery.utils import worker_direct
 from celery.utils.serialization import pickle
 from celery.utils.timer2 import Timer

celery/worker/control.py

@@ -22,8 +22,8 @@ from celery.utils.log import get_logger
 from celery.utils import jsonify
 
 from . import state as worker_state
+from .request import Request
 from .state import revoked
-from .job import Request
 
 __all__ = ['Panel']
 DEFAULT_TASK_INFO_ITEMS = ('exchange', 'routing_key', 'rate_limit')

celery/worker/job.py → celery/worker/request.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    celery.worker.job
-    ~~~~~~~~~~~~~~~~~
+    celery.worker.request
+    ~~~~~~~~~~~~~~~~~~~~~
 
     This module defines the :class:`Request` class,
     which specifies how tasks are executed.

celery/worker/state.py

@@ -42,10 +42,10 @@ REVOKES_MAX = 50000
 #: being expired when the max limit has been exceeded.
 REVOKE_EXPIRES = 10800
 
-#: set of all reserved :class:`~celery.worker.job.Request`'s.
+#: set of all reserved :class:`~celery.worker.request.Request`'s.
 reserved_requests = set()
 
-#: set of currently active :class:`~celery.worker.job.Request`'s.
+#: set of currently active :class:`~celery.worker.request.Request`'s.
 active_requests = set()
 
 #: count of tasks accepted by the worker, sorted by type.

celery/worker/strategy.py

@@ -15,7 +15,7 @@ from kombu.async.timer import to_timestamp
 from celery.utils.log import get_logger
 from celery.utils.timeutils import timezone
 
-from .job import Request, RequestV1
+from .request import Request, RequestV1
 from .state import task_reserved
 
 __all__ = ['default']

docs/internals/app-overview.rst

@@ -226,7 +226,7 @@ App Dependency Tree
     * celery.apps.worker.Worker
         * celery.worker.WorkerController
             * celery.worker.consumer.Consumer
-                * celery.worker.job.TaskRequest
+                * celery.worker.request.Request
                 * celery.events.EventDispatcher
                 * celery.worker.control.ControlDispatch
                     * celery.woker.control.registry.Panel

docs/internals/worker.rst

@@ -35,7 +35,7 @@ Receives messages from the broker using `Kombu`_.
 .. _`Kombu`: http://pypi.python.org/pypi/kombu
 
 When a message is received it's converted into a
-:class:`celery.worker.job.TaskRequest` object.
+:class:`celery.worker.request.Request` object.
 
 Tasks with an ETA, or rate-limit are entered into the `timer`,
 messages that can be immediately processed are sent to the execution pool.

docs/reference/celery.worker.job.rst → docs/reference/celery.worker.request.rst

@@ -1,11 +1,11 @@
 =====================================
- celery.worker.job
+ celery.worker.request
 =====================================
 
 .. contents::
     :local:
-.. currentmodule:: celery.worker.job
+.. currentmodule:: celery.worker.request
 
-.. automodule:: celery.worker.job
+.. automodule:: celery.worker.request
     :members:
     :undoc-members:

docs/reference/index.rst

@@ -47,7 +47,7 @@
     celery.apps.beat
     celery.worker
     celery.worker.consumer
-    celery.worker.job
+    celery.worker.request
     celery.worker.state
     celery.worker.strategy
     celery.bin.base

docs/userguide/extending.rst

@@ -463,7 +463,7 @@ Methods
 .. method:: apply_eta_task(request)
 
     Schedule eta task to execute based on the ``request.eta`` attribute.
-    (:class:`~celery.worker.job.Request`)
+    (:class:`~celery.worker.request.Request`)
 
 
 

docs/userguide/signals.rst

@@ -271,7 +271,7 @@ Provides arguments:
 
 * request
 
-    This is a :class:`~celery.worker.job.Request` instance, and not
+    This is a :class:`~celery.worker.request.Request` instance, and not
     ``task.request``.   When using the prefork pool this signal
     is dispatched in the parent process, so ``task.request`` is not available
     and should not be used.  Use this object instead, which should have many

docs/whatsnew-3.1.rst

@@ -1072,8 +1072,9 @@ In Other News
   (Issue #1555).
 
     The revoked signal is dispatched after the task request is removed from
-    the stack, so it must instead use the :class:`~celery.worker.job.Request`
-    object to get information about the task.
+    the stack, so it must instead use the
+    :class:`~celery.worker.request.Request` object to get information
+    about the task.
 
 - Worker: New :option:`-X` command line argument to exclude queues
   (Issue #1399).
@@ -1235,7 +1236,7 @@ Internal changes
     - Result backends (:class:`celery.backends.base.BaseBackend`)
     - :class:`celery.worker.WorkController`
     - :class:`celery.worker.Consumer`
-    - :class:`celery.worker.job.Request`
+    - :class:`celery.worker.request.Request`
 
     This means that you have to pass a specific app when instantiating
     these classes.