Browse Source

PEP8ify + pyflakes

Ask Solem 14 years ago
parent
commit
ee8e04d4e3

+ 0 - 3
celery/concurrency/processes/pool.py

@@ -793,9 +793,6 @@ class ApplyResult(object):
         assert self._ready
         assert self._ready
         return self._success
         return self._success
 
 
-    def accepted(self):
-        return self._accepted
-
     def worker_pids(self):
     def worker_pids(self):
         return filter(None, [self._worker_pid])
         return filter(None, [self._worker_pid])
 
 

+ 0 - 4
celery/events/cursesmon.py

@@ -8,8 +8,6 @@ from datetime import datetime
 from itertools import count
 from itertools import count
 from textwrap import wrap
 from textwrap import wrap
 
 
-from carrot.utils import rpartition
-
 from celery import states
 from celery import states
 from celery.events import EventReceiver
 from celery.events import EventReceiver
 from celery.events.state import State
 from celery.events.state import State
@@ -18,8 +16,6 @@ from celery.task import control
 from celery.utils import abbr, abbrtask
 from celery.utils import abbr, abbrtask
 
 
 
 
-
-
 class CursesMonitor(object):
 class CursesMonitor(object):
     keymap = {}
     keymap = {}
     win = None
     win = None

+ 0 - 2
celery/events/dumper.py

@@ -4,7 +4,6 @@ from datetime import datetime
 
 
 from celery.datastructures import LocalCache
 from celery.datastructures import LocalCache
 from celery.events import EventReceiver
 from celery.events import EventReceiver
-from celery.events.state import State
 from celery.messaging import establish_connection
 from celery.messaging import establish_connection
 
 
 
 
@@ -53,7 +52,6 @@ class Dumper(object):
                                     humanize_type(type), sep, task, fields))
                                     humanize_type(type), sep, task, fields))
 
 
 
 
-
 def evdump():
 def evdump():
     sys.stderr.write("-> evdump: starting capture...\n")
     sys.stderr.write("-> evdump: starting capture...\n")
     dumper = Dumper()
     dumper = Dumper()

+ 0 - 3
celery/events/snapshot.py

@@ -1,6 +1,3 @@
-import sys
-import time
-
 from celery.utils import timer2
 from celery.utils import timer2
 
 
 from celery import conf
 from celery import conf

+ 0 - 1
celery/events/state.py

@@ -191,7 +191,6 @@ class State(object):
         finally:
         finally:
             self.thaw(replay=True)
             self.thaw(replay=True)
 
 
-
     def clear_tasks(self, ready=True):
     def clear_tasks(self, ready=True):
         if ready:
         if ready:
             self.tasks = dict((uuid, task)
             self.tasks = dict((uuid, task)

+ 1 - 1
celery/exceptions.py

@@ -65,6 +65,7 @@ class RetryTaskError(Exception):
         Exception.__init__(self, message, exc, *args,
         Exception.__init__(self, message, exc, *args,
                            **kwargs)
                            **kwargs)
 
 
+
 class TaskRevokedError(Exception):
 class TaskRevokedError(Exception):
     """The task has been revoked, so no result available."""
     """The task has been revoked, so no result available."""
     pass
     pass
@@ -72,4 +73,3 @@ class TaskRevokedError(Exception):
 
 
 class NotConfigured(UserWarning):
 class NotConfigured(UserWarning):
     """Celery has not been configured, as no config module has been found."""
     """Celery has not been configured, as no config module has been found."""
-

+ 0 - 1
celery/loaders/default.py

@@ -23,7 +23,6 @@ DEFAULT_UNCONFIGURED_SETTINGS = {
 }
 }
 
 
 
 
-
 def wanted_module_item(item):
 def wanted_module_item(item):
     return not item.startswith("_")
     return not item.startswith("_")
 
 

+ 0 - 2
celery/log.py

@@ -137,8 +137,6 @@ def setup_task_logger(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
     return LoggerAdapter(logger, task_kwargs)
     return LoggerAdapter(logger, task_kwargs)
 
 
 
 
-
-
 def _setup_logger(logger, logfile, format, colorize,
 def _setup_logger(logger, logfile, format, colorize,
         formatter=ColorFormatter, **kwargs):
         formatter=ColorFormatter, **kwargs):
 
 

+ 0 - 2
celery/task/base.py

@@ -1,8 +1,6 @@
 import sys
 import sys
 import warnings
 import warnings
 
 
-from datetime import timedelta
-
 from celery import conf
 from celery import conf
 from celery.backends import default_backend
 from celery.backends import default_backend
 from celery.exceptions import MaxRetriesExceededError, RetryTaskError
 from celery.exceptions import MaxRetriesExceededError, RetryTaskError

+ 0 - 2
celery/tests/test_beat.py

@@ -187,8 +187,6 @@ class test_Scheduler(unittest.TestCase):
     def test_ticks(self):
     def test_ticks(self):
         scheduler = mScheduler()
         scheduler = mScheduler()
         nums = [600, 300, 650, 120, 250, 36]
         nums = [600, 300, 650, 120, 250, 36]
-        expected = min(nums, scheduler.max_interval)
-
         s = dict(("test_ticks%s" % i,
         s = dict(("test_ticks%s" % i,
                  {"schedule": mocked_schedule(False, j)})
                  {"schedule": mocked_schedule(False, j)})
                     for i, j in enumerate(nums))
                     for i, j in enumerate(nums))

+ 3 - 1
celery/tests/test_log.py

@@ -29,11 +29,13 @@ def get_handlers(logger):
         return logger.logger.handlers
         return logger.logger.handlers
     return logger.handlers
     return logger.handlers
 
 
+
 def set_handlers(logger, new_handlers):
 def set_handlers(logger, new_handlers):
     if isinstance(logger, LoggerAdapter):
     if isinstance(logger, LoggerAdapter):
         logger.logger.handlers = new_handlers
         logger.logger.handlers = new_handlers
     logger.handlers = new_handlers
     logger.handlers = new_handlers
 
 
+
 @contextmanager
 @contextmanager
 def wrap_logger(logger, loglevel=logging.ERROR):
 def wrap_logger(logger, loglevel=logging.ERROR):
     old_handlers = get_handlers(logger)
     old_handlers = get_handlers(logger)
@@ -107,7 +109,7 @@ class test_default_logger(unittest.TestCase):
         set_handlers(l, [])
         set_handlers(l, [])
         tempfile = mktemp(suffix="unittest", prefix="celery")
         tempfile = mktemp(suffix="unittest", prefix="celery")
         l = self.setup_logger(logfile=tempfile, loglevel=0, root=False)
         l = self.setup_logger(logfile=tempfile, loglevel=0, root=False)
-        self.assertIsInstance(get_handlers(l)[0 ],
+        self.assertIsInstance(get_handlers(l)[0],
                               logging.FileHandler)
                               logging.FileHandler)
 
 
     def test_emergency_error_stderr(self):
     def test_emergency_error_stderr(self):

+ 0 - 1
celery/tests/test_result.py

@@ -108,7 +108,6 @@ class TestAsyncResult(unittest.TestCase):
         self.assertRaises(KeyError, nok_res.get)
         self.assertRaises(KeyError, nok_res.get)
         self.assertIsInstance(nok2_res.result, KeyError)
         self.assertIsInstance(nok2_res.result, KeyError)
 
 
-
     def test_get_timeout(self):
     def test_get_timeout(self):
         res = AsyncResult(self.task4["id"]) # has RETRY status
         res = AsyncResult(self.task4["id"]) # has RETRY status
         self.assertRaises(TimeoutError, res.get, timeout=0.1)
         self.assertRaises(TimeoutError, res.get, timeout=0.1)

+ 1 - 1
celery/utils/compat.py

@@ -333,7 +333,7 @@ class _CompatLoggerAdapter(object):
             msg, kwargs = self.process(msg, kwargs)
             msg, kwargs = self.process(msg, kwargs)
             self._log(level, msg, args, **kwargs)
             self._log(level, msg, args, **kwargs)
 
 
-    def makeRecord(self, name, level, fn, lno, msg, args, exc_info, 
+    def makeRecord(self, name, level, fn, lno, msg, args, exc_info,
             func=None, extra=None):
             func=None, extra=None):
         rv = logging.LogRecord(name, level, fn, lno,
         rv = logging.LogRecord(name, level, fn, lno,
                                msg, args, exc_info, func)
                                msg, args, exc_info, func)

+ 0 - 3
celery/worker/__init__.py

@@ -8,8 +8,6 @@ import logging
 import traceback
 import traceback
 from multiprocessing.util import Finalize
 from multiprocessing.util import Finalize
 
 
-from celery.utils.timer2 import Timer
-
 from celery import beat
 from celery import beat
 from celery import conf
 from celery import conf
 from celery import log
 from celery import log
@@ -258,4 +256,3 @@ class WorkController(object):
 
 
     def on_timer_tick(self, delay):
     def on_timer_tick(self, delay):
         self.timer_debug("Scheduler wake-up! Next eta %s secs." % delay)
         self.timer_debug("Scheduler wake-up! Next eta %s secs." % delay)
-

+ 0 - 1
celery/worker/controllers.py

@@ -7,7 +7,6 @@ import time
 import threading
 import threading
 from Queue import Empty as QueueEmpty
 from Queue import Empty as QueueEmpty
 
 
-from celery import conf
 from celery import log
 from celery import log
 
 
 
 

+ 0 - 1
celery/worker/job.py

@@ -14,7 +14,6 @@ from celery.loaders import current_loader
 from celery.registry import tasks
 from celery.registry import tasks
 from celery.utils import noop, kwdict, fun_takes_kwargs
 from celery.utils import noop, kwdict, fun_takes_kwargs
 from celery.utils import truncate_text, maybe_iso8601
 from celery.utils import truncate_text, maybe_iso8601
-from celery.utils.compat import any
 from celery.utils.mail import mail_admins
 from celery.utils.mail import mail_admins
 from celery.worker import state
 from celery.worker import state
 
 

+ 1 - 3
celery/worker/listener.py

@@ -78,12 +78,10 @@ from __future__ import generators
 import socket
 import socket
 import warnings
 import warnings
 
 
-from datetime import datetime
-
 from carrot.connection import AMQPConnectionException
 from carrot.connection import AMQPConnectionException
 
 
 from celery import conf
 from celery import conf
-from celery.utils import noop, retry_over_time, maybe_iso8601
+from celery.utils import noop, retry_over_time
 from celery.worker.job import TaskRequest, InvalidTaskError
 from celery.worker.job import TaskRequest, InvalidTaskError
 from celery.worker.control import ControlDispatch
 from celery.worker.control import ControlDispatch
 from celery.worker.heartbeat import Heart
 from celery.worker.heartbeat import Heart