Ask Solem 16 vuotta sitten
vanhempi
commit
448f4656b1

+ 1 - 1
celery/result.py

@@ -289,7 +289,7 @@ class TaskSetResult(object):
                     return list(results)
         finally:
             timeout_timer.cancel()
-    
+
     @property
     def total(self):
         """The total number of tasks in the :class:`celery.task.TaskSet`."""

+ 2 - 2
celery/tests/test_datastructures.py

@@ -14,7 +14,7 @@ class TestPositionQueue(unittest.TestCase):
         self.assertEquals(q.filled, [])
         self.assertEquals(len(q), 0)
         self.assertFalse(q.full())
-        
+
     def test_position_queue_almost(self):
         q = PositionQueue(length=10)
         q[3] = 3
@@ -24,7 +24,7 @@ class TestPositionQueue(unittest.TestCase):
         self.assertEquals(q.filled, [3, 6, 9])
         self.assertEquals(len(q), 3)
         self.assertFalse(q.full())
-    
+
     def test_position_queue_full(self):
         q = PositionQueue(length=10)
         for i in xrange(10):

+ 1 - 1
celery/tests/test_monitoring.py

@@ -18,7 +18,7 @@ class TestTaskTimerStats(unittest.TestCase):
         time.sleep(time_sleep)
         time_stop = t.stop()
         self.assertTrue(time_stop)
-        self.assertFalse(time_stop > max_appx) 
+        self.assertFalse(time_stop > max_appx)
         self.assertFalse(time_stop <= min_appx)
 
         strstop = str(time_stop)[0:3]

+ 9 - 8
celery/tests/test_worker_job.py

@@ -32,7 +32,7 @@ class TestJail(unittest.TestCase):
     def test_execute_jail_success(self):
         ret = jail(str(uuid4()), str(uuid4()), mytask, [2], {})
         self.assertEquals(ret, 4)
-    
+
     def test_execute_jail_failure(self):
         ret = jail(str(uuid4()), str(uuid4()), mytask_raising, [4], {})
         self.assertTrue(isinstance(ret, ExceptionInfo))
@@ -58,12 +58,12 @@ class TestJail(unittest.TestCase):
 class TestTaskWrapper(unittest.TestCase):
 
     def test_task_wrapper_attrs(self):
-        tw = TaskWrapper(str(uuid4()), str(uuid4()), mytask, [1], {"f":"x"})
+        tw = TaskWrapper(str(uuid4()), str(uuid4()), mytask, [1], {"f": "x"})
         for attr in ("task_name", "task_id", "args", "kwargs", "logger"):
             self.assertTrue(getattr(tw, attr, None))
 
     def test_task_wrapper_repr(self):
-        tw = TaskWrapper(str(uuid4()), str(uuid4()), mytask, [1], {"f":"x"})
+        tw = TaskWrapper(str(uuid4()), str(uuid4()), mytask, [1], {"f": "x"})
         self.assertTrue(repr(tw))
 
     def test_task_wrapper_mail_attrs(self):
@@ -94,7 +94,8 @@ class TestTaskWrapper(unittest.TestCase):
         self.assertEquals(tw.task_name, body["task"])
         self.assertEquals(tw.task_id, body["id"])
         self.assertEquals(tw.args, body["args"])
-        self.assertEquals(tw.kwargs.keys()[0], u"æØåveéðƒeæ".encode("utf-8"))
+        self.assertEquals(tw.kwargs.keys()[0],
+                          u"æØåveéðƒeæ".encode("utf-8"))
         self.assertFalse(isinstance(tw.kwargs.keys()[0], unicode))
         self.assertEquals(id(mytask), id(tw.task_func))
         self.assertTrue(tw.logger)
@@ -110,7 +111,7 @@ class TestTaskWrapper(unittest.TestCase):
 
     def test_execute(self):
         tid = str(uuid4())
-        tw = TaskWrapper("cu.mytask", tid, mytask, [4], {"f":"x"})
+        tw = TaskWrapper("cu.mytask", tid, mytask, [4], {"f": "x"})
         self.assertEquals(tw.execute(), 256)
         meta = TaskMeta.objects.get(task_id=tid)
         self.assertEquals(meta.result, 256)
@@ -119,7 +120,7 @@ class TestTaskWrapper(unittest.TestCase):
     def test_execute_fail(self):
         tid = str(uuid4())
         tw = TaskWrapper("cu.mytask-raising", tid, mytask_raising, [4],
-                         {"f":"x"})
+                         {"f": "x"})
         self.assertTrue(isinstance(tw.execute(), ExceptionInfo))
         meta = TaskMeta.objects.get(task_id=tid)
         self.assertEquals(meta.status, "FAILURE")
@@ -127,7 +128,7 @@ class TestTaskWrapper(unittest.TestCase):
 
     def test_execute_using_pool(self):
         tid = str(uuid4())
-        tw = TaskWrapper("cu.mytask", tid, mytask, [4], {"f":"x"})
+        tw = TaskWrapper("cu.mytask", tid, mytask, [4], {"f": "x"})
         p = TaskPool(2)
         p.start()
         asyncres = tw.execute_using_pool(p)
@@ -136,7 +137,7 @@ class TestTaskWrapper(unittest.TestCase):
 
     def test_default_kwargs(self):
         tid = str(uuid4())
-        tw = TaskWrapper("cu.mytask", tid, mytask, [4], {"f":"x"})
+        tw = TaskWrapper("cu.mytask", tid, mytask, [4], {"f": "x"})
         self.assertEquals(tw.extend_with_default_kwargs(10, "some_logfile"), {
             "f": "x",
             "logfile": "some_logfile",

+ 4 - 4
celery/worker/controllers.py

@@ -26,9 +26,9 @@ class InfinityThread(threading.Thread):
 
     def run(self):
         """This is the body of the thread.
-        
+
         To start the thread use :meth:`start` instead.
-        
+
         """
         while True:
             if self._shutdown.isSet():
@@ -37,11 +37,11 @@ class InfinityThread(threading.Thread):
         self._stopped.set() # indicate that we are stopped
 
     def on_iteration(self):
-        """This is the method called for every iteration and must be 
+        """This is the method called for every iteration and must be
         implemented by every subclass of :class:`InfinityThread`."""
         raise NotImplementedError(
                 "InfiniteThreads must implement on_iteration")
-    
+
     def stop(self):
         """Gracefully shutdown the thread."""
         self._shutdown.set()