Move AlreadyRegistered and NotRegistered to celery.exceptions

celery/exceptions.py

@@ -11,3 +11,11 @@ class RetryTaskError(Exception):
     def __init__(self, message, exc, *args, **kwargs):
         self.exc = exc
         super(RetryTaskError, self).__init__(message, exc, *args, **kwargs)
+
+
+class NotRegistered(Exception):
+    """The task is not registered."""
+
+
+class AlreadyRegistered(Exception):
+    """The task is already registered."""

celery/execute.py

@@ -114,7 +114,7 @@ def delay_task(task_name, *args, **kwargs):
 
     :param \*\*kwargs: keyword arguments to pass on to the task.
 
-    :raises celery.registry.NotRegistered: exception if no such task
+    :raises celery.exceptions.NotRegistered: exception if no such task
         has been registered in the task registry.
 
     :rtype: :class:`celery.result.AsyncResult`.

celery/registry.py

@@ -1,17 +1,10 @@
 """celery.registry"""
 from celery import discovery
 from celery.utils import get_full_cls_name
+from celery.exceptions import NotRegistered, AlreadyRegistered
 from UserDict import UserDict
 
 
-class NotRegistered(Exception):
-    """The task is not registered."""
-
-
-class AlreadyRegistered(Exception):
-    """The task is already registered."""
-
-
 class TaskRegistry(UserDict):
     """Site registry for tasks."""
 
@@ -60,7 +53,8 @@ class TaskRegistry(UserDict):
         :param name: name of the task to unregister, or a
             :class:`celery.task.Task` class with a valid ``name`` attribute.
 
-        :raises NotRegistered: if the task has not been registered.
+        :raises celery.exceptions.NotRegistered: if the task has not
+            been registered.
 
         """
         if hasattr(name, "run"):

celery/worker/__init__.py

@@ -8,7 +8,7 @@ Documentation for this module is in ``docs/reference/celery.worker.rst``.
 from carrot.connection import DjangoBrokerConnection, AMQPConnectionException
 from celery.worker.controllers import Mediator, PeriodicWorkController
 from celery.worker.job import TaskWrapper
-from celery.registry import NotRegistered
+from celery.exceptions import NotRegistered
 from celery.messaging import get_consumer_set
 from celery.conf import DAEMON_CONCURRENCY, DAEMON_LOG_FILE
 from celery.conf import AMQP_CONNECTION_RETRY, AMQP_CONNECTION_MAX_RETRIES

celery/worker/job.py

@@ -3,7 +3,8 @@
 Jobs Executable by the Worker Server.
 
 """
-from celery.registry import tasks, NotRegistered
+from celery.registry import tasks
+from celery.exceptions import NotRegistered
 from celery.execute import ExecuteWrapper
 from celery.utils import noop
 from django.core.mail import mail_admins