Ask Solem преди 15 години
родител
ревизия
eddabd6c28
променени са 5 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 0 1
      celery/log.py
  2. 0 1
      celery/tests/test_loaders.py
  3. 0 1
      celery/worker/__init__.py
  4. 4 2
      celery/worker/control.py
  5. 2 1
      celery/worker/scheduler.py

+ 0 - 1
celery/log.py

@@ -63,7 +63,6 @@ def get_default_logger(loglevel=None):
     return logger
 
 
-
 def setup_logger(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
         format=conf.CELERYD_LOG_FORMAT, **kwargs):
     """Setup the ``multiprocessing`` logger. If ``logfile`` is not specified,

+ 0 - 1
celery/tests/test_loaders.py

@@ -109,7 +109,6 @@ def modifies_django_env(fun):
     return _protected
 
 
-
 class TestDefaultLoader(unittest.TestCase):
 
     def test_wanted_module_item(self):

+ 0 - 1
celery/worker/__init__.py

@@ -17,7 +17,6 @@ from celery.log import setup_logger, _hijack_multiprocessing_logger
 from celery.beat import EmbeddedClockService
 from celery.utils import noop, instantiate
 
-from celery.worker.pool import TaskPool
 from celery.worker.buckets import TaskBucket
 from celery.worker.scheduler import Scheduler
 

+ 4 - 2
celery/worker/control.py

@@ -121,6 +121,8 @@ class ControlDispatch(object):
             self.logger.error("No such control command: %s" % command)
         else:
             # need to make sure keyword arguments are not in unicode
-            # this should be fixed in newer Python's (see: http://bugs.python.org/issue4978)
-            kwargs = dict((k.encode('utf8'), v) for (k, v) in kwargs.iteritems())
+            # this should be fixed in newer Python's
+            # (see: http://bugs.python.org/issue4978)
+            kwargs = dict((k.encode('utf8'), v)
+                            for (k, v) in kwargs.iteritems())
             return control(**kwargs)

+ 2 - 1
celery/worker/scheduler.py

@@ -17,7 +17,8 @@ class Scheduler(object):
 
     """
 
-    def __init__(self, ready_queue, logger=None, max_interval=DEFAULT_MAX_INTERVAL):
+    def __init__(self, ready_queue, logger=None,
+            max_interval=DEFAULT_MAX_INTERVAL):
         self.max_interval = float(max_interval)
         self.ready_queue = ready_queue
         self.logger = logger or log.get_default_logger()