Ask Solem 14 年之前
父節點
當前提交
fa83d5f137

+ 0 - 1
celery/concurrency/evg.py

@@ -30,4 +30,3 @@ class TaskPool(BasePool):
 
     def blocking(self, fun, *args, **kwargs):
         Greenlet.spawn(fun, *args, **kwargs).get()
-

+ 0 - 2
celery/decorators.py

@@ -14,5 +14,3 @@ def task(*args, **kwargs):
 def periodic_task(*args, **kwargs):
     kwargs.setdefault("accept_magic_kwargs", True)
     return _task.periodic_task(*args, **kwargs)
-
-

+ 9 - 7
celery/events/cursesmon.py

@@ -20,6 +20,7 @@ TIMESTAMP_WIDTH = 8
 MIN_WORKER_WIDTH = 15
 MIN_TASK_WIDTH = 16
 
+
 class CursesMonitor(object):
     keymap = {}
     win = None
@@ -52,8 +53,10 @@ class CursesMonitor(object):
 
     def format_row(self, uuid, task, worker, timestamp, state):
         mx = self.display_width
-        detail_width = mx - 1 - STATE_WIDTH - 1 - TIMESTAMP_WIDTH # include spacing
-        uuid_space = detail_width - 1 - MIN_TASK_WIDTH - 1 - MIN_WORKER_WIDTH # include spacing
+
+        # include spacing
+        detail_width = mx - 1 - STATE_WIDTH - 1 - TIMESTAMP_WIDTH
+        uuid_space = detail_width - 1 - MIN_TASK_WIDTH - 1 - MIN_WORKER_WIDTH
 
         if uuid_space < UUID_WIDTH:
             uuid_width = uuid_space
@@ -77,8 +80,8 @@ class CursesMonitor(object):
 
     @property
     def display_width(self):
-         _, mx = self.win.getmaxyx()
-         return mx - BORDER_SPACING
+        _, mx = self.win.getmaxyx()
+        return mx - BORDER_SPACING
 
     def find_position(self):
         if not self.tasks:
@@ -238,8 +241,6 @@ class CursesMonitor(object):
                                 abbr(" " * 4 + subline, self.screen_width - 4),
                                 curses.A_NORMAL)
 
-
-
         return self.alert(alert_callback,
                 "Task details for %s" % self.selected_task)
 
@@ -304,7 +305,8 @@ class CursesMonitor(object):
                     lineno = y()
                     win.addstr(lineno, x, line, attr)
                     if state_color:
-                        win.addstr(lineno, len(line) - STATE_WIDTH + BORDER_SPACING - 1,
+                        win.addstr(lineno,
+                                len(line) - STATE_WIDTH + BORDER_SPACING - 1,
                                 task.state, state_color | attr)
                     if task.ready:
                         task.visited = time.time()

+ 0 - 3
celery/task/base.py

@@ -732,12 +732,9 @@ def create_task_cls(app, **kwargs):
         accept_magic_kwargs = kwargs.get("accept_magic_kwargs", False)
 
     return Task
-
-
 Task = create_task_cls(app_or_default(), accept_magic_kwargs=True)
 
 
-
 class PeriodicTask(Task):
     """A periodic task is a task that behaves like a :manpage:`cron` job.
 

+ 4 - 4
celery/tests/test_backends/test_database.py

@@ -35,10 +35,10 @@ class test_DatabaseBackend(unittest.TestCase):
     def test_missing_task_meta_is_dict_with_pending(self):
         tb = DatabaseBackend()
         self.assertDictContainsSubset({
-            'status' : states.PENDING,
-            'task_id' : "xxx-does-not-exist-at-all",
-            'result' : None,
-            'traceback' : None,
+            'status': states.PENDING,
+            'task_id': "xxx-does-not-exist-at-all",
+            'result': None,
+            'traceback': None,
             }, tb.get_task_meta("xxx-does-not-exist-at-all"))
 
     def test_mark_as_done(self):

+ 12 - 4
celery/tests/test_cursesmon.py

@@ -2,11 +2,13 @@ from celery.tests.utils import unittest
 
 from celery.events import cursesmon
 
+
 class MockWindow(object):
 
     def getmaxyx(self):
         return self.y, self.x
 
+
 class TestCursesDisplay(unittest.TestCase):
 
     def setUp(self):
@@ -22,7 +24,8 @@ class TestCursesDisplay(unittest.TestCase):
             'workerworkerworkerworkerworkerworkerworkerworker',
             '21:13:20',
             'SUCCESS')
-        self.assertEqual('783da208-77d0-40ca-b3d6-37dd6dbb55d3 workerworker... task.task.[.]tas 21:13:20 SUCCESS ',
+        self.assertEqual('783da208-77d0-40ca-b3d6-37dd6dbb55d3 '
+                         'workerworker... task.task.[.]tas 21:13:20 SUCCESS ',
                          row)
 
     def test_format_row_with_truncated_uuid(self):
@@ -33,14 +36,16 @@ class TestCursesDisplay(unittest.TestCase):
             'workerworkerworkerworkerworkerworkerworkerworker',
             '21:13:20',
             'SUCCESS')
-        self.assertEqual('783da208-77d0-40ca-b3d... workerworker... task.task.[.]tas 21:13:20 SUCCESS ',
+        self.assertEqual('783da208-77d0-40ca-b3d... workerworker... '
+                         'task.task.[.]tas 21:13:20 SUCCESS ',
                          row)
 
     def test_format_title_row(self):
         self.win.x, self.win.y = 80, 24
         row = self.monitor.format_row("UUID", "TASK",
                                       "WORKER", "TIME", "STATE")
-        self.assertEqual('UUID                      WORKER          TASK             TIME     STATE   ',
+        self.assertEqual('UUID                      WORKER'
+                         'TASK             TIME     STATE   ',
                          row)
 
     def test_format_row_for_wide_screen_with_short_uuid(self):
@@ -52,5 +57,8 @@ class TestCursesDisplay(unittest.TestCase):
             '21:13:20',
             'SUCCESS')
         self.assertEqual(136, len(row))
-        self.assertEqual('783da208-77d0-40ca-b3d6-37dd6dbb55d3 workerworkerworkerworkerworkerworker... task.task.task.task.task.task.task.[.]tas 21:13:20 SUCCESS ',
+        self.assertEqual('783da208-77d0-40ca-b3d6-37dd6dbb55d3 '
+                         'workerworkerworkerworkerworkerworker...'
+                         'task.task.task.task.task.task.task.[.]tas'
+                         '21:13:20 SUCCESS ',
                          row)

+ 0 - 1
celery/tests/test_task_builtins.py

@@ -1,7 +1,6 @@
 from celery.tests.utils import unittest
 
 from celery.task.builtins import PingTask, DeleteExpiredTaskMetaTask
-from celery.utils.serialization import pickle
 
 
 def some_func(i):

+ 2 - 2
contrib/release/flakesignore.txt

@@ -13,8 +13,8 @@ celery/loaders/default.py:(.+?) redefinition of unused 'AttributeDict'
 celery/platforms.py:(.+?) redefinition of unused '_setproctitle'
 celery/platforms.py:(.+?) redefinition of unused 'pwd'
 celery/platforms.py:(.+?) redefinition of unused 'grp'
-celery/serialization.py:(.+?) redefinition of unused 'cpickle'
-celery/serialization.py:(.+?) redefinition of function 'subclass_exception'
+celery/utils/serialization.py:(.+?) redefinition of unused 'cpickle'
+celery/utils/serialization.py:(.+?) redefinition of function 'subclass_exception'
 celery/tests/test_backends/test_redis.py:(.+?) redefinition of unused 'ConnectionError'
 celery/tests/test_log.py:(.+?) redefinition of unused 'contextmanager'
 celery/tests/test_task_http.py:(.+?) redefinition of unused 'contextmanager'