PEP8ify

celery/backends/base.py

@@ -213,10 +213,10 @@ class KeyValueStoreBackend(BaseBackend):
 
     def get(self, key):
         raise NotImplementedError("Must implement the get method.")
-    
+
     def set(self, key, value):
         raise NotImplementedError("Must implement the set method.")
-    
+
     def store_result(self, task_id, result, status):
         """Store task result and status."""
         if status == "DONE":
@@ -229,7 +229,7 @@ class KeyValueStoreBackend(BaseBackend):
     def get_status(self, task_id):
         """Get the status of a task."""
         return self._get_task_meta_for(task_id)["status"]
-    
+
     def get_result(self, task_id):
         """Get the result of a task."""
         meta = self._get_task_meta_for(task_id)
@@ -237,7 +237,7 @@ class KeyValueStoreBackend(BaseBackend):
             return self.exception_to_python(meta["result"])
         else:
             return meta["result"]
-    
+
     def is_done(self, task_id):
         """Returns ``True`` if the task executed successfully."""
         return self.get_status(task_id) == "DONE"

celery/backends/cache.py

@@ -11,4 +11,3 @@ class Backend(KeyValueStoreBackend):
 
     def set(self, key, value):
         cache.set(key, value)
-

celery/backends/tyrant.py

@@ -49,10 +49,10 @@ class Backend(KeyValueStoreBackend):
     def open(self):
         """Get :class:`pytyrant.PyTyrant`` instance with the current
         server configuration.
-        
+
         The connection is then cached until you do an
         explicit :meth:`close`.
-        
+
         """
         # connection overrides bool()
         if self._connection is None:
@@ -75,4 +75,3 @@ class Backend(KeyValueStoreBackend):
 
     def set(self, key, value):
         self.open()[key] = value
-

celery/messaging.py

@@ -43,6 +43,7 @@ class TaskPublisher(Publisher):
 
     def retry_task(self, task_name, task_id, delivery_info, **kwargs):
         kwargs["routing_key"] = delivery_info.get("routing_key")
+        kwargs["retries"] = kwargs.get("retries", 0) + 1
         self._delay_task(task_name, task_id, **kwargs)
 
     def _delay_task(self, task_name, task_id=None, part_of_set=None,
@@ -90,6 +91,3 @@ class StatsConsumer(Consumer):
     exchange_type = "direct"
     decoder = pickle.loads
     no_ack=True
-
-    def receive(self, message_data, message):
-        pass

celery/pool.py

@@ -17,7 +17,7 @@ from functools import partial as curry
 class DynamicPool(Pool):
     """Version of :class:`multiprocessing.Pool` that can dynamically grow
     in size."""
-    
+
     def __init__(self, processes=None, initializer=None, initargs=()):
         super(DynamicPool, self).__init__(processes=processes,
                                           initializer=initializer,

celery/result.py

@@ -329,6 +329,6 @@ class EagerResult(BaseAsyncResult):
     def status(self):
         """The tasks status"""
         return self._status
-    
+
     def __repr__(self):
         return "<EagerResult: %s>" % self.task_id

celery/task/base.py

@@ -218,6 +218,7 @@ class Task(object):
         """
         return apply(cls, args, kwargs, **options)
 
+
 class TaskSet(object):
     """A task containing several subtasks, making it possible
     to track how many, or when all of the tasks has been completed.

celery/tests/test_backends/test_cache.py

@@ -33,7 +33,7 @@ class TestCacheBackend(unittest.TestCase):
 
     def test_is_pickled(self):
         cb = CacheBackend()
-    
+
         tid2 = gen_unique_id()
         result = {"foo": "baz", "bar": SomeClass(12345)}
         cb.mark_as_done(tid2, result)

celery/tests/test_backends/test_tyrant.py

@@ -39,7 +39,7 @@ class TestTyrantBackend(unittest.TestCase):
     def test_cached_connection(self):
         tb = get_tyrant_or_None()
         if not tb:
-            return # Skip test 
+            return # Skip test
 
         self.assertTrue(tb._connection is not None)
         tb.close()
@@ -69,7 +69,7 @@ class TestTyrantBackend(unittest.TestCase):
         tb = get_tyrant_or_None()
         if not tb:
             return
-    
+
         tid2 = gen_unique_id()
         result = {"foo": "baz", "bar": SomeClass(12345)}
         tb.mark_as_done(tid2, result)

celery/tests/test_result.py

@@ -39,14 +39,14 @@ class TestAsyncResult(unittest.TestCase):
 
         self.assertTrue(ok_res.is_done())
         self.assertFalse(nok_res.is_done())
-    
+
     def test_sucessful(self):
         ok_res = AsyncResult(self.task1["id"])
         nok_res = AsyncResult(self.task3["id"])
 
         self.assertTrue(ok_res.successful())
         self.assertFalse(nok_res.successful())
-       
+
     def test_str(self):
         ok_res = AsyncResult(self.task1["id"])
         ok2_res = AsyncResult(self.task2["id"])
@@ -54,7 +54,7 @@ class TestAsyncResult(unittest.TestCase):
         self.assertEquals(str(ok_res), self.task1["id"])
         self.assertEquals(str(ok2_res), self.task2["id"])
         self.assertEquals(str(nok_res), self.task3["id"])
-    
+
     def test_repr(self):
         ok_res = AsyncResult(self.task1["id"])
         ok2_res = AsyncResult(self.task2["id"])
@@ -97,7 +97,7 @@ class TestTaskSetResult(unittest.TestCase):
 
         for i, t in enumerate(it):
             self.assertEquals(t.get(), i)
-    
+
     def test___iter__(self):
 
         it = iter(self.ts)
@@ -111,16 +111,16 @@ class TestTaskSetResult(unittest.TestCase):
 
     def test_successful(self):
         self.assertTrue(self.ts.successful())
-    
+
     def test_failed(self):
         self.assertFalse(self.ts.failed())
-    
+
     def test_waiting(self):
         self.assertFalse(self.ts.waiting())
 
     def test_ready(self):
         self.assertTrue(self.ts.ready())
-    
+
     def test_completed_count(self):
         self.assertEquals(self.ts.completed_count(), self.ts.total)
 
@@ -143,7 +143,7 @@ class TestFailedTaskSetResult(TestTaskSetResult):
         save_result(failed)
         failed_res = AsyncResult(failed["id"])
         self.ts = TaskSetResult(gen_unique_id(), subtasks + [failed_res])
-    
+
     def test_itersubtasks(self):
 
         it = self.ts.itersubtasks()
@@ -166,10 +166,10 @@ class TestFailedTaskSetResult(TestTaskSetResult):
 
     def test_join(self):
         self.assertRaises(KeyError, self.ts.join)
-    
+
     def test_successful(self):
         self.assertFalse(self.ts.successful())
-    
+
     def test_failed(self):
         self.assertTrue(self.ts.failed())
 
@@ -186,7 +186,7 @@ class TestTaskSetPending(unittest.TestCase):
 
     def test_ready(self):
         self.assertFalse(self.ts.ready())
-    
+
     def test_waiting(self):
         self.assertTrue(self.ts.waiting())
 

celery/tests/test_task.py

@@ -154,10 +154,10 @@ class TestTaskApply(unittest.TestCase):
         e = IncrementCounterTask.apply()
         self.assertTrue(isinstance(e, EagerResult))
         self.assertEquals(e.get(), 1)
-        
+
         e = IncrementCounterTask.apply(args=[1])
         self.assertEquals(e.get(), 2)
-        
+
         e = IncrementCounterTask.apply(kwargs={"increment_by": 4})
         self.assertEquals(e.get(), 6)
 

celery/utils.py

@@ -34,7 +34,7 @@ def chunks(it, n):
 def gen_unique_id():
     """Generate a unique id, having - hopefully - a very small chance of
     collission.
-    
+
     For now this is provided by :func:`uuid.uuid4`.
     """
     return str(uuid.uuid4())

celery/views.py

@@ -5,7 +5,6 @@ from celery.result import AsyncResult
 from anyjson import serialize as JSON_dump
 
 
-
 def apply(request, task_name, *args):
     """View applying a task.