Ask Solem 11 years ago
parent
commit
b583fe9291

+ 1 - 1
celery/local.py

@@ -14,7 +14,7 @@ from __future__ import absolute_import
 
 import importlib
 
-from .five import long_t, string, string_t
+from .five import long_t, string
 
 __module__ = __name__  # used by Proxy class body
 

+ 0 - 1
celery/result.py

@@ -437,7 +437,6 @@ class ResultSet(ResultBase):
         while results:
             removed = set()
             for task_id, result in items(results):
-                print("READY IS: %r" % result.ready)
                 if result.ready():
                     yield result.get(timeout=timeout and timeout - elapsed,
                                      propagate=propagate)

+ 0 - 2
celery/tests/app/test_loaders.py

@@ -208,7 +208,6 @@ class test_DefaultLoader(Case):
             if prevconfig:
                 sys.modules[configname] = prevconfig
 
-
     def test_import_from_cwd(self):
         l = default.Loader()
         old_path = list(sys.path)
@@ -282,4 +281,3 @@ class test_autodiscovery(Case):
 
                 find.side_effect = ImportError()
                 base.find_related_module(base, 'tasks')
-

+ 1 - 2
celery/tests/compat_modules/test_sets.py

@@ -46,6 +46,7 @@ class test_subtask(Case):
         self.assertTupleEqual(args, (2, 2))
         self.assertDictEqual(kwargs, {'cache': True})
         self.assertDictEqual(options, {'routing_key': 'CPU-bound'})
+
     def test_delay_argmerge(self):
         s = MockTask.subtask(
             (2, ), {'cache': True}, {'routing_key': 'CPU-bound'},
@@ -135,9 +136,7 @@ class test_TaskSet(Case):
             ts.apply_async()
             self.assertTrue(parent.request.children)
 
-
     def test_apply_async(self):
-
         applied = [0]
 
         class mocksubtask(Signature):

+ 1 - 1
celery/tests/tasks/test_result.py

@@ -334,7 +334,7 @@ class test_ResultSet(AppCase):
         r1.ready.return_value = False
         x = ResultSet([r1])
         with self.dummy_copy():
-            with patch('celery.result.time') as _time:
+            with patch('celery.result.time'):
                 with self.assertRaises(TimeoutError):
                     list(x.iterate(timeout=1))
 

+ 1 - 1
celery/tests/tasks/test_tasks.py

@@ -291,7 +291,7 @@ class test_tasks(Case):
             consumer.receive('foo', 'foo')
         consumer.purge()
         self.assertIsNone(consumer.queues[0].get())
-        consumer2 = T1.get_consumer(queues=[Queue('foo')])
+        T1.get_consumer(queues=[Queue('foo')])
 
         # Without arguments.
         presult = T1.delay()

+ 1 - 2
celery/tests/tasks/test_trace.py

@@ -5,7 +5,6 @@ from mock import Mock, patch
 from celery import uuid
 from celery import signals
 from celery import states
-from celery.app.task import Task as BaseTask
 from celery.exceptions import RetryTaskError, Ignore
 from celery.task.trace import (
     TraceInfo,
@@ -14,7 +13,7 @@ from celery.task.trace import (
     setup_worker_optimizations,
     reset_worker_optimizations,
 )
-from celery.tests.utils import AppCase, Mock
+from celery.tests.utils import AppCase
 
 
 def trace(task, args=(), kwargs={}, propagate=False, **opts):

+ 2 - 0
celery/tests/utilities/test_platforms.py

@@ -48,6 +48,7 @@ class test_find_option_with_arg(Case):
             'bar'
         )
 
+
 class test_close_open_fds(Case):
 
     def test_closes(self):
@@ -60,6 +61,7 @@ class test_close_open_fds(Case):
                 _close.side_effect.errno = errno.EBADF
                 close_open_fds()
 
+
 class test_ignore_errno(Case):
 
     def test_raises_EBADF(self):

+ 3 - 0
celery/tests/worker/test_autoreload.py

@@ -130,6 +130,7 @@ class test_KQueueMontior(Case):
             hub.poller.on_file_change,
             x.handle_event,
         )
+
     def test_on_poll_close(self):
         x = KQueueMonitor(['a', 'b'])
         x.close = Mock()
@@ -246,9 +247,11 @@ class test_Autoreloader(AppCase):
         hub = Mock()
         x._monitor = None
         x.on_init = Mock()
+
         def se(*args, **kwargs):
             x._monitor = Mock()
         x.on_init.side_effect = se
+
         x.on_poll_init(hub)
         x.on_init.assert_called_with()
         x._monitor.on_poll_init.assert_called_with(hub)

+ 0 - 1
celery/tests/worker/test_loops.py

@@ -62,7 +62,6 @@ class X(object):
         _consumer.on_invalid_task = self.on_invalid_task
         _consumer.strategies = self.obj.strategies
 
-
     def timeout_then_error(self, mock):
 
         def first(*args, **kwargs):