Use our own ImproperlyConfigured exception

celery/backends/mongodb.py

@@ -1,7 +1,6 @@
 """MongoDB backend for celery."""
 from datetime import datetime
 
-from django.core.exceptions import ImproperlyConfigured
 from billiard.serialization import pickle
 try:
     import pymongo
@@ -10,8 +9,9 @@ except ImportError:
 
 from celery import conf
 from celery import states
-from celery.backends.base import BaseDictBackend
 from celery.loaders import load_settings
+from celery.backends.base import BaseDictBackend
+from celery.exceptions import ImproperlyConfigured
 
 
 class Bunch:
@@ -34,7 +34,7 @@ class MongoBackend(BaseDictBackend):
     def __init__(self, *args, **kwargs):
         """Initialize MongoDB backend instance.
 
-        :raises django.core.exceptions.ImproperlyConfigured: if
+        :raises celery.exceptions.ImproperlyConfigured: if
             module :mod:`pymongo` is not available.
 
         """

celery/backends/pyredis.py

@@ -1,9 +1,9 @@
 import warnings
 
-from django.core.exceptions import ImproperlyConfigured
 
-from celery.backends.base import KeyValueStoreBackend
 from celery.loaders import load_settings
+from celery.backends.base import KeyValueStoreBackend
+from celery.exceptions import ImproperlyConfigured
 
 try:
     import redis
@@ -24,7 +24,7 @@ class RedisBackend(KeyValueStoreBackend):
 
         The port to the Redis server.
 
-        Raises :class:`django.core.exceptions.ImproperlyConfigured` if
+        Raises :class:`celery.exceptions.ImproperlyConfigured` if
         :setting:`REDIS_HOST` or :setting:`REDIS_PORT` is not set.
 
     """

celery/backends/tyrant.py

@@ -1,12 +1,12 @@
 """celery.backends.tyrant"""
-from django.core.exceptions import ImproperlyConfigured
 try:
     import pytyrant
 except ImportError:
     pytyrant = None
 
-from celery.backends.base import KeyValueStoreBackend
 from celery.loaders import load_settings
+from celery.backends.base import KeyValueStoreBackend
+from celery.exceptions import ImproperlyConfigured
 
 
 class TyrantBackend(KeyValueStoreBackend):
@@ -27,7 +27,7 @@ class TyrantBackend(KeyValueStoreBackend):
     def __init__(self, tyrant_host=None, tyrant_port=None):
         """Initialize Tokyo Tyrant backend instance.
 
-        Raises :class:`django.core.exceptions.ImproperlyConfigured` if
+        Raises :class:`celery.exceptions.ImproperlyConfigured` if
         :setting:`TT_HOST` or :setting:`TT_PORT` is not set.
 
         """

celery/exceptions.py

@@ -9,6 +9,10 @@ Task of kind %s is not registered, please make sure it's imported.
 """.strip()
 
 
+class ImproperlyConfigured(Exception):
+    """Celery is somehow improperly configured."""
+
+
 class NotRegistered(KeyError):
     """The task is not registered."""
 
@@ -19,6 +23,7 @@ class NotRegistered(KeyError):
 
 class AlreadyRegistered(Exception):
     """The task is already registered."""
+    pass
 
 
 class TimeoutError(Exception):

celery/tests/test_backends/test_amqp.py

@@ -2,7 +2,7 @@ import sys
 import errno
 import unittest
 
-from django.core.exceptions import ImproperlyConfigured
+from celery.exceptions import ImproperlyConfigured
 
 from celery import states
 from celery.utils import gen_unique_id

celery/tests/test_backends/test_redis.py

@@ -3,7 +3,7 @@ import errno
 import socket
 import unittest
 
-from django.core.exceptions import ImproperlyConfigured
+from celery.exceptions import ImproperlyConfigured
 
 from celery import states
 from celery.utils import gen_unique_id

celery/tests/test_backends/test_tyrant.py

@@ -3,7 +3,7 @@ import errno
 import socket
 import unittest
 
-from django.core.exceptions import ImproperlyConfigured
+from celery.exceptions import ImproperlyConfigured
 
 from celery import states
 from celery.utils import gen_unique_id

celery/tests/test_celery.py

@@ -6,7 +6,7 @@ class TestInitFile(unittest.TestCase):
 
     def test_version(self):
         self.assertTrue(celery.VERSION)
-        self.assertEqual(len(celery.VERSION), 3)
+        self.assertTrue(len(celery.VERSION) >= 3)
         celery.VERSION = (0, 3, 0)
         self.assertFalse(celery.is_stable_release())
         self.assertEqual(celery.__version__.count("."), 2)