Ask Solem 14 years ago
parent
commit
fdb12cc1c9

+ 1 - 1
celery/loaders/default.py

@@ -62,7 +62,7 @@ class Loader(BaseLoader):
                                     DEFAULT_CONFIG_MODULE)
         try:
             celeryconfig = import_module(configname)
-        except ImportError, exc:
+        except ImportError:
             warnings.warn("No celeryconfig.py module found! Please make "
                           "sure it exists and is available to Python.",
                           NotConfigured)

+ 0 - 1
celery/messaging.py

@@ -14,7 +14,6 @@ from celery import conf
 from celery import signals
 from celery.utils import gen_unique_id, mitemgetter, noop
 from celery.utils.functional import wraps
-from celery.loaders import load_settings
 
 
 MSG_OPTIONS = ("mandatory", "priority", "immediate",

+ 0 - 1
celery/task/builtins.py

@@ -1,6 +1,5 @@
 from datetime import timedelta
 
-from celery.backends import default_backend
 from celery.serialization import pickle
 from celery.task.base import Task, PeriodicTask
 from celery.task.sets import TaskSet

+ 1 - 1
celery/task/sets.py

@@ -5,7 +5,7 @@ from UserList import UserList
 from celery import conf
 from celery import registry
 from celery.datastructures import AttributeDict
-from celery.messaging import establish_connection, with_connection
+from celery.messaging import with_connection
 from celery.messaging import TaskPublisher
 from celery.result import TaskSetResult
 from celery.utils import gen_unique_id

+ 2 - 3
celery/tests/test_backends/test_cache.py

@@ -3,11 +3,11 @@ import types
 import unittest2 as unittest
 
 from celery import states
-from celery.backends.cache import CacheBackend, get_best_memcache, DummyClient
+from celery.backends.cache import CacheBackend, DummyClient
 from celery.exceptions import ImproperlyConfigured
 from celery.utils import gen_unique_id
 
-from celery.tests.utils import execute_context, mask_modules
+from celery.tests.utils import mask_modules
 
 
 class SomeClass(object):
@@ -92,7 +92,6 @@ class test_get_best_memcache(unittest.TestCase):
     def test_pylibmc(self):
         pylibmc = self.mock_pylibmc()
         pylibmc.next()
-        import __builtin__
         sys.modules.pop("celery.backends.cache", None)
         from celery.backends import cache
         self.assertEqual(cache.get_best_memcache().__module__, "pylibmc")

+ 0 - 4
celery/tests/test_backends/test_database.py

@@ -1,5 +1,3 @@
-import sys
-import socket
 import unittest2 as unittest
 
 from datetime import datetime
@@ -12,8 +10,6 @@ from celery.db.models import Task, TaskSet
 from celery.utils import gen_unique_id
 from celery.backends.database import DatabaseBackend
 
-from celery.tests.utils import execute_context, mask_modules
-
 
 class SomeClass(object):
 

+ 0 - 1
celery/tests/test_bin/test_celeryd.py

@@ -11,7 +11,6 @@ from celery import platform
 from celery import signals
 from celery.bin import celeryd as cd
 from celery.exceptions import ImproperlyConfigured
-from celery.utils import noop
 from celery.utils import patch
 from celery.utils.functional import wraps
 

+ 0 - 1
celery/tests/test_buckets.py

@@ -1,6 +1,5 @@
 from __future__ import generators
 
-import os
 import sys
 import time
 import unittest2 as unittest

+ 1 - 4
celery/tests/test_task_http.py

@@ -8,10 +8,7 @@ try:
     from contextlib import contextmanager
 except ImportError:
     from celery.tests.utils import fallback_contextmanager as contextmanager
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from StringIO import StringIO
 
 from anyjson import serialize
 

+ 1 - 1
celery/tests/test_task_sets.py

@@ -6,7 +6,7 @@ from celery import conf
 from celery.task import Task
 from celery.task.sets import subtask, TaskSet
 
-from celery.tests.utils import execute_context, with_eager_tasks
+from celery.tests.utils import execute_context
 from celery.tests.compat import catch_warnings
 
 

+ 7 - 10
celery/tests/test_worker_control.py

@@ -66,9 +66,9 @@ class test_ControlPanel(unittest.TestCase):
         self.assertIn("worker-online", listener.event_dispatcher.sent)
 
     def test_dump_tasks(self):
-        tasks = "\n".join(self.panel.execute("dump_tasks"))
-        self.assertIn("mytask", tasks)
-        self.assertIn("rate_limit=200", tasks)
+        info = "\n".join(self.panel.execute("dump_tasks"))
+        self.assertIn("mytask", info)
+        self.assertIn("rate_limit=200", info)
 
     def test_dump_schedule(self):
         listener = Listener()
@@ -80,14 +80,11 @@ class test_ControlPanel(unittest.TestCase):
     def test_dump_reserved(self):
         listener = Listener()
         panel = self.create_panel(listener=listener)
-        tasks = "\n".join(panel.execute("dump_reserved"))
-        self.assertIn("the quick brown fox", tasks)
+        info = "\n".join(panel.execute("dump_reserved"))
+        self.assertIn("the quick brown fox", info)
         listener.ready_queue = FastQueue()
-        tasks = "\n".join(panel.execute("dump_reserved"))
-        self.assertFalse(tasks)
-
-    def test_dump_reserved(self):
-        self.panel.execute("dump_reserved")
+        info = "\n".join(panel.execute("dump_reserved"))
+        self.assertFalse(info)
 
     def test_rate_limit_when_disabled(self):
         conf.DISABLE_RATE_LIMITS = True

+ 1 - 2
celery/tests/test_worker_job.py

@@ -14,7 +14,6 @@ from celery.datastructures import ExceptionInfo
 from celery.decorators import task as task_dec
 from celery.exceptions import RetryTaskError, NotRegistered
 from celery.log import setup_logger
-from celery.registry import tasks
 from celery.result import AsyncResult
 from celery.task.base import Task
 from celery.utils import gen_unique_id
@@ -86,7 +85,7 @@ class test_WorkerTaskTrace(unittest.TestCase):
     def test_marked_as_started(self):
         mytask.track_started = True
         try:
-            ret = jail(gen_unique_id(), mytask.name, [2], {})
+            jail(gen_unique_id(), mytask.name, [2], {})
         finally:
             mytask.track_started = False
 

+ 1 - 1
celery/tests/test_worker_scheduler.py

@@ -46,7 +46,7 @@ class test_Scheduler(unittest.TestCase):
             callback_called[0] = True
 
         sched.enter(MockItem("foo", revoked=True), eta=now, callback=callback)
-        remaining = iter(sched).next()
+        iter(sched).next()
         self.assertFalse(callback_called[0])
         self.assertRaises(Empty, ready_queue.get_nowait)
         self.assertFalse(sched.queue)