Renames celery.execute.trace -> celery.task.trace

celery/app/task/__init__.py

@@ -649,7 +649,7 @@ class BaseTask(object):
 
         """
         # trace imports BaseTask, so need to import inline.
-        from celery.execute.trace import eager_trace_task
+        from celery.task.trace import eager_trace_task
 
         app = self._get_app()
         args = args or []

celery/execute/trace.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    celery.execute.trace
+    celery.task.trace
     ~~~~~~~~~~~~~~~~~~~~
 
     This module defines how the task execution is traced:

celery/task/__init__.py

@@ -14,7 +14,7 @@ from __future__ import absolute_import
 import sys
 
 from celery import current_app
-from celery.__compat__ import MagicModule, create_magic_module
+from celery.__compat__ import MagicModule, recreate_module
 from celery.app import current_task as _current_task
 from celery.local import Proxy
 
@@ -25,7 +25,7 @@ class module(MagicModule):
         return self.task(*args, **kwargs)
 
 
-old_module, new_module = create_magic_module(__name__,
+old_module, new_module = recreate_module(__name__,
     by_module={
         "celery.task.base": ["BaseTask", "Task", "PeriodicTask",
                              "task", "periodic_task"],

celery/tests/test_task/test_execute_trace.py

@@ -6,7 +6,7 @@ from mock import patch
 from celery import current_app
 from celery import states
 from celery.exceptions import RetryTaskError
-from celery.execute.trace import TraceInfo, eager_trace_task, trace_task
+from celery.task.trace import TraceInfo, eager_trace_task, trace_task
 from celery.tests.utils import Case, Mock
 
 
@@ -57,8 +57,8 @@ class test_trace(Case):
         with self.assertRaises(KeyError):
             trace(raises, (KeyError("foo"), ), {}, propagate=True)
 
-    @patch("celery.execute.trace.build_tracer")
-    @patch("celery.execute.trace.report_internal_error")
+    @patch("celery.task.trace.build_tracer")
+    @patch("celery.task.trace.report_internal_error")
     def test_outside_body_error(self, report_internal_error, build_tracer):
         tracer = Mock()
         tracer.side_effect = KeyError("foo")

celery/tests/test_worker/test_worker_job.py

@@ -21,7 +21,7 @@ from celery.concurrency.base import BasePool
 from celery.datastructures import ExceptionInfo
 from celery.exceptions import (RetryTaskError,
                                WorkerLostError, InvalidTaskError)
-from celery.execute.trace import eager_trace_task, TraceInfo
+from celery.task.trace import eager_trace_task, TraceInfo
 from celery.result import AsyncResult
 from celery.task import task as task_dec
 from celery.task.base import Task

celery/worker/job.py

@@ -26,7 +26,7 @@ from celery import current_app
 from celery import exceptions
 from celery.app import app_or_default
 from celery.datastructures import ExceptionInfo
-from celery.execute.trace import build_tracer, trace_task, report_internal_error
+from celery.task.trace import build_tracer, trace_task, report_internal_error
 from celery.platforms import set_mp_process_title as setps
 from celery.utils import fun_takes_kwargs
 from celery.utils.functional import noop
@@ -219,10 +219,9 @@ class Request(object):
         return result
 
     def execute(self, loglevel=None, logfile=None):
-        """Execute the task in a :func:`~celery.execute.trace.trace_task`.
+        """Execute the task in a :func:`~celery.task.trace.trace_task`.
 
         :keyword loglevel: The loglevel used by the task.
-
         :keyword logfile: The logfile used by the task.
 
         """

contrib/release/doc4allmods

@@ -15,7 +15,6 @@ SKIP_FILES="celery.backends.pyredis.rst
             celery.local.rst
             celery.app.base.rst
             celery.apps.rst
-            celery.execute.rst
             celery.backends.database.a805d4bd.rst
             celery.backends.database.dfd042c7.rst
             celery.utils.encoding.rst"

contrib/release/py3k-run-tests

@@ -15,7 +15,6 @@ nosetests -vd celery.tests                                      \
               celery.bin.celeryd_detach                         \
               celery.bin.celeryctl                              \
               celery.bin.camqadm                                \
-              celery.execute                                    \
               celery.local                                      \
               celery.platforms                                  \
               celery.utils.patch                                \