PEP8ify

celery/bin/celerybeat.py

@@ -176,9 +176,10 @@ def parse_options(arguments):
     options, values = parser.parse_args(arguments)
     return options
 
+
 def main():
     options = parse_options(sys.argv[1:])
     run_clockservice(**vars(options))
 
 if __name__ == "__main__":
-    main()
+    main()

celery/bin/celeryd.py

@@ -275,9 +275,10 @@ def set_process_status(info):
         info = "%s (%s)" % (info, " ".join(sys.argv[arg_start:]))
     platform.set_mp_process_title("celeryd", info=info)
 
+
 def main():
     options = parse_options(sys.argv[1:])
     run_worker(**vars(options))
 
 if __name__ == "__main__":
-    main()
+    main()

celery/decorators.py

@@ -57,7 +57,6 @@ def task(*args, **options):
     return inner_create_task_cls(**options)
 
 
-
 def periodic_task(**options):
     """Task decorator to create a periodic task.
 

celery/platform.py

@@ -92,7 +92,7 @@ def create_pidlock(pidfile):
 class DaemonContext(object):
     _is_open = False
 
-    def __init__(self, pidfile=None, chroot_directory=None, 
+    def __init__(self, pidfile=None, chroot_directory=None,
             working_directory=DAEMON_WORKDIR, umask=DAEMON_UMASK, **kwargs):
         self.pidfile = pidfile
         self.chroot_directory = chroot_directory

celery/tests/test_beat.py

@@ -158,7 +158,6 @@ class TestScheduler(unittest.TestCase):
         self.assertTrue(self.scheduler.is_due(due)[0])
         self.assertFalse(self.scheduler.is_due(pending)[0])
 
-
     def test_tick(self):
         self.scheduler.schedule.pop(DuePeriodicTaskRaising.name, None)
         self.registry.pop(DuePeriodicTaskRaising.name, None)
@@ -200,8 +199,6 @@ class TestClockService(unittest.TestCase):
         self.assertTrue(s._shutdown.isSet())
 
 
-
-
 class TestClockServiceThread(unittest.TestCase):
 
     def test_start_stop(self):
@@ -214,4 +211,3 @@ class TestClockServiceThread(unittest.TestCase):
 
         s.stop()
         self.assertTrue(s.clockservice.stopped)
-

celery/tests/test_events.py

@@ -20,6 +20,7 @@ class MockPublisher(object):
                 return event
         return False
 
+
 class TestEvent(unittest.TestCase):
 
     def test_constructor(self):
@@ -39,6 +40,7 @@ class TestEventDispatcher(unittest.TestCase):
         eventer.send("World War II", ended=True)
         self.assertTrue(publisher.has_event("World War II"))
 
+
 class TestEventReceiver(unittest.TestCase):
 
     def test_process(self):

celery/tests/test_loaders.py

@@ -11,7 +11,6 @@ from celery.loaders import default
 from celery.tests.utils import with_environ
 
 
-
 class TestLoaders(unittest.TestCase):
 
     def test_get_loader_cls(self):
@@ -86,7 +85,8 @@ class TestDjangoLoader(unittest.TestCase):
         self.assertFalse(djangoapp.find_related_module("sys", "tasks"))
 
     def test_find_related_module_no_related(self):
-        self.assertFalse(djangoapp.find_related_module("someapp", "frobulators"))
+        self.assertFalse(djangoapp.find_related_module("someapp",
+                                                       "frobulators"))
 
 
 class TestDefaultLoader(unittest.TestCase):
@@ -97,7 +97,6 @@ class TestDefaultLoader(unittest.TestCase):
         self.assertFalse(default.wanted_module_item("_foo"))
         self.assertFalse(default.wanted_module_item("__foo"))
 
-
     def test_read_configuration(self):
         from types import ModuleType
 
@@ -109,17 +108,14 @@ class TestDefaultLoader(unittest.TestCase):
 
         sys.modules["celeryconfig"] = celeryconfig
         try:
-           l = default.Loader()
-           settings = l.read_configuration()
-           self.assertEquals(settings.CELERY_IMPORTS, ("os", "sys"))
-           from django.conf import settings
-           settings.configured = False
-           settings = l.read_configuration()
-           self.assertEquals(settings.CELERY_IMPORTS, ("os", "sys"))
-           self.assertTrue(settings.configured)
-           l.on_worker_init()
+            l = default.Loader()
+            settings = l.read_configuration()
+            self.assertEquals(settings.CELERY_IMPORTS, ("os", "sys"))
+            from django.conf import settings
+            settings.configured = False
+            settings = l.read_configuration()
+            self.assertEquals(settings.CELERY_IMPORTS, ("os", "sys"))
+            self.assertTrue(settings.configured)
+            l.on_worker_init()
         finally:
             sys.modules.pop("celeryconfig", None)
-
-
-

celery/tests/test_log.py

@@ -27,7 +27,6 @@ def wrap_logger(logger, loglevel=logging.ERROR):
     logger.handlers = old_handlers
 
 
-
 class TestLog(unittest.TestCase):
 
     def _assertLog(self, logger, logmsg, loglevel=logging.ERROR):
@@ -125,5 +124,3 @@ class TestLog(unittest.TestCase):
             p.close()
             self.assertFalse(p.isatty())
             self.assertTrue(p.fileno() is None)
-
-

celery/tests/test_result.py

@@ -77,7 +77,6 @@ class TestAsyncResult(unittest.TestCase):
         self.assertTrue(nok_res.traceback)
         self.assertTrue(nok_res2.traceback)
 
-
     def test_get(self):
         ok_res = AsyncResult(self.task1["id"])
         ok2_res = AsyncResult(self.task2["id"])

celery/tests/test_task.py

@@ -79,7 +79,6 @@ class RetryTaskMockApply(task.Task):
             kwargs.update({"kwarg": kwarg})
             return self.retry(args=[arg1, arg2], kwargs=kwargs, countdown=0)
 
-
     @classmethod
     def apply_async(self, *args, **kwargs):
         self.applied = 1
@@ -133,7 +132,6 @@ class TestTaskRetries(unittest.TestCase):
         finally:
             RetryTaskMockApply.applied = 0
 
-
     def test_retry_with_kwargs(self):
         RetryTaskCustomExc.max_retries = 3
         RetryTaskCustomExc.iterations = 0
@@ -298,7 +296,6 @@ class TestCeleryTasks(unittest.TestCase):
         finally:
             base.TaskPublisher = old_pub
 
-
     def test_get_logger(self):
         T1 = self.createTaskCls("T1", "c.unittest.t.t1")
         t1 = T1()
@@ -381,7 +378,6 @@ class MyPeriodic(task.PeriodicTask):
     run_every = timedelta(hours=1)
 
 
-
 class TestPeriodicTask(unittest.TestCase):
 
     def test_must_have_run_every(self):
@@ -416,4 +412,3 @@ class TestPeriodicTask(unittest.TestCase):
         due, remaining = p.is_due(datetime.now() - p.run_every)
         self.assertTrue(due)
         self.assertEquals(remaining, p.timedelta_seconds(p.run_every))
-

celery/tests/test_task_control.py

@@ -58,6 +58,6 @@ class TestBroadcast(unittest.TestCase):
     def test_revoke_from_resultset(self):
         from celery.result import TaskSetResult, AsyncResult
         r = TaskSetResult(gen_unique_id(), map(AsyncResult, [gen_unique_id()
-                                                            for i in range(10)]))
+                                                        for i in range(10)]))
         r.revoke()
         self.assertTrue("revoke" in MockBroadcastPublisher.sent)

celery/tests/test_utils.py

@@ -76,7 +76,6 @@ class TestRetryOverTime(unittest.TestCase):
         self.assertRaises(KeyError, utils.retry_over_time, _fun,
                          (socket.error, ), args=[32, 32], max_retries=3)
 
-
     @sleepdeprived
     def test_retries_on_failure(self):
 

celery/tests/test_utils_info.py

@@ -32,7 +32,6 @@ ROUTE_FORMAT = """
 """.strip()
 
 
-
 class TestInfo(unittest.TestCase):
 
     def test_humanize_seconds(self):

celery/tests/test_views.py

@@ -121,7 +121,7 @@ class TestTaskIsSuccessful(ViewTestCase):
 
     def test_is_successful_pending(self):
         self.assertStatusForIs("PENDING", False)
- 
+
     def test_is_successful_failure(self):
         self.assertStatusForIs("FAILURE", False)
 

celery/tests/test_worker_heartbeat.py

@@ -37,7 +37,7 @@ class TestHeart(unittest.TestCase):
         heart.stop()
         heart.stop()
         self.assertTrue(heart._state == "CLOSE")
- 
+
         heart = Heart(eventer, interval=0.00001)
         heart._shutdown.set()
         for i in range(10):

celery/tests/test_worker_job.py

@@ -255,7 +255,6 @@ class TestTaskWrapper(unittest.TestCase):
         w.handle_retry(value_, type_, tb_, "")
         self.assertEquals(mytask.backend.get_status(uuid), "RETRY")
 
-
     def test_worker_task_trace_handle_failure(self):
         from celery.worker.job import WorkerTaskTrace
         uuid = gen_unique_id()
@@ -268,7 +267,6 @@ class TestTaskWrapper(unittest.TestCase):
         w.handle_failure(value_, type_, tb_, "")
         self.assertEquals(mytask.backend.get_status(uuid), "FAILURE")
 
-
     def test_executed_bit(self):
         from celery.worker.job import AlreadyExecutedError
         tw = TaskWrapper(mytask.name, gen_unique_id(), [], {})

celery/tests/utils.py

@@ -100,7 +100,6 @@ def skip_unless(predicate, reason):
     return skip_if(not predicate, reason)
 
 
-
 # Taken from
 # http://bitbucket.org/runeh/snippets/src/tip/missing_modules.py
 @contextmanager