Forráskód Böngészése

PEP8ify + pyflakes

Ask Solem 14 éve
szülő
commit
f612848a62

+ 1 - 0
celery/apps/worker.py

@@ -39,6 +39,7 @@ EXTRA_INFO_FMT = """
 %(tasks)s
 """
 
+
 def cpu_count():
     if multiprocessing is not None:
         return multiprocessing.cpu_count()

+ 0 - 1
celery/concurrency/solo.py

@@ -4,7 +4,6 @@ Process Pools.
 
 """
 import os
-import signal as _signal
 
 from celery.concurrency.base import BasePool, apply_target
 

+ 2 - 2
celery/datastructures.py

@@ -14,7 +14,7 @@ import time
 import traceback
 
 from itertools import chain
-from Queue import Queue, Empty as QueueEmpty
+from Queue import Empty
 
 from celery.utils.compat import OrderedDict
 
@@ -186,7 +186,7 @@ def consume_queue(queue):
     while 1:
         try:
             yield queue.get_nowait()
-        except QueueEmpty:
+        except Empty:
             break
 
 

+ 2 - 1
celery/log.py

@@ -113,7 +113,8 @@ class Logging(object):
             mp = mputil and mputil.get_logger() or None
             for logger in (root, mp):
                 if logger:
-                    self._setup_logger(logger, logfile, format, colorize, **kwargs)
+                    self._setup_logger(logger, logfile, format,
+                                       colorize, **kwargs)
                     logger.setLevel(loglevel)
         Logging._setup = True
         return receivers

+ 0 - 2
celery/tests/test_cursesmon.py

@@ -1,7 +1,5 @@
 from nose import SkipTest
 
-from celery.app import current_app
-
 from celery.tests.utils import unittest
 
 

+ 1 - 1
celery/tests/test_pool.py

@@ -28,7 +28,7 @@ class TestTaskPool(unittest.TestCase):
 
     def setUp(self):
         try:
-            import multiprocessing
+            __import__("multiprocessing")
         except ImportError:
             raise SkipTest("multiprocessing not supported")
         from celery.concurrency.processes import TaskPool

+ 3 - 3
celery/tests/test_worker.py

@@ -171,6 +171,7 @@ def create_message(backend, **data):
                    content_type="application/x-python-serialize",
                    content_encoding="binary")
 
+
 class test_QoS(unittest.TestCase):
 
     class _QoS(QoS):
@@ -222,10 +223,9 @@ class test_QoS(unittest.TestCase):
         self.assertEqual(qos.value, 2010)
 
         qos.value = 1000
-        threaded([add, sub]) # n = 2
+        threaded([add, sub])  # n = 2
         self.assertEqual(qos.value, 1000)
 
-
     class MockConsumer(object):
         prefetch_count = 0
 
@@ -552,7 +552,7 @@ class test_Consumer(unittest.TestCase):
     def test_receieve_message_eta(self):
         l = MyKombuConsumer(self.ready_queue, self.eta_schedule, self.logger,
                           send_events=False)
-        dispatcher = l.event_dispatcher = MockEventDispatcher()
+        l.event_dispatcher = MockEventDispatcher()
         backend = MockBackend()
         m = create_message(backend, task=foo_task.name,
                            args=[2, 4, 8], kwargs={},

+ 1 - 1
celery/worker/consumer.py

@@ -120,7 +120,7 @@ class QoS(object):
             self._mutex.release()
 
     def _sub(self, n=1):
-        assert self.value -n > 1
+        assert self.value - n > 1
         self.value -= n
 
     def decrement(self, n=1):

+ 14 - 2
contrib/release/flakesignore.txt

@@ -51,5 +51,17 @@ celery/task/schedules.py:2: 'schedule' imported but unused
 celery/task/schedules.py:2: 'crontab_parser' imported but unused
 celery/task/schedules.py:2: 'crontab' imported but unused
 celery/tests/__init__.py:17: undefined name 'WindowsError'
-
-
+celery/utils/patch.py:12: redefinition of unused 'current_process' from line 10
+celery/utils/compat.py:325: redefinition of unused 'multiprocessing' from line 323
+celery/tests/test_cursesmon.py:18: 'curses' imported but unused
+celery/log.py:11: redefinition of unused 'mputil' from line 9
+celery/log.py:11: redefinition of unused 'current_process' from line 8
+celery/tests/test_bin/test_celeryd.py:9: redefinition of unused 'current_process' from line 7
+celery/tests/test_bin/test_celeryd.py:324: 'setproctitle' imported but unused
+celery/tests/test_bin/test_celeryev.py:36: 'curses' imported but unused
+celery/tests/test_concurrency_processes.py:15: redefinition of unused 'mp' from line 8
+celery/tests/test_concurrency_processes.py:103: 'multiprocessing' imported but unused
+celery/apps/worker.py:6: redefinition of unused 'multiprocessing' from line 4
+celery/beat.py:14: redefinition of unused 'multiprocessing' from line 12
+celery/bin/celeryd.py:79: redefinition of unused 'freeze_support' from line 77
+celery/tests/test_cursesmon.py:16: 'curses' imported but unused