Browse Source

PEP8ify + pyflakes

Ask Solem 13 years ago
parent
commit
dab55c80b6

+ 2 - 1
celery/bin/celeryd.py

@@ -108,7 +108,8 @@ class WorkerCommand(Command):
                 default=conf.CELERYD_POOL,
                 action="store", dest="pool", type="str",
                 help="Pool implementation: "
-                     "processes (default), eventlet, gevent, solo or threads."),
+                     "processes (default), eventlet, gevent, "
+                     "solo or threads."),
             Option('--purge', '--discard', default=False,
                 action="store_true", dest="discard",
                 help="Discard all waiting tasks before the server is"

+ 0 - 1
celery/datastructures.py

@@ -13,7 +13,6 @@ import time
 import traceback
 
 from itertools import chain
-from Queue import Empty
 from threading import RLock
 
 from .utils.compat import UserDict, OrderedDict

+ 0 - 1
celery/tests/test_utils/test_datastructures.py

@@ -2,7 +2,6 @@ from __future__ import absolute_import
 from __future__ import with_statement
 
 import sys
-from Queue import Queue
 
 from celery.datastructures import ExceptionInfo, LRUCache
 from celery.datastructures import LimitedSet

+ 1 - 1
celery/tests/test_worker/test_worker_job.py

@@ -538,7 +538,7 @@ class test_TaskRequest(unittest.TestCase):
         self.assertTrue(tw.logger)
 
     def test_from_message_empty_args(self):
-        body = {"task" : mytask.name, "id": uuid()}
+        body = {"task": mytask.name, "id": uuid()}
         m = Message(None, body=anyjson.serialize(body), backend="foo",
                           content_type="application/json",
                           content_encoding="utf-8")

+ 1 - 1
celery/utils/serialization.py

@@ -38,7 +38,7 @@ else:
 #: List of base classes we probably don't want to reduce to.
 unwanted_base_classes = (StandardError, Exception, BaseException, object)
 
-__all__ = ["subclass_exception", "find_nearest_unpickleable_exception",
+__all__ = ["subclass_exception", "find_nearest_pickleable_exception",
            "create_exception_cls", "UnpickleableExceptionWrapper",
            "get_pickleable_exception", "get_pickled_exception"]
 

+ 1 - 0
celery/utils/timer2.py

@@ -31,6 +31,7 @@ __all__ = ["TimedFunctionFailed", "to_timestamp",
            "apply_interval", "enter_after", "enter",
            "exit_after", "cancel", "clear"]
 
+
 class TimedFunctionFailed(UserWarning):
     pass
 

+ 2 - 2
celery/worker/control/builtins.py

@@ -23,11 +23,11 @@ from .registry import Panel
 
 __all__ = ["revoke", "enable_events", "disable_events",
            "heartbeat", "rate_limit", "time_limit", "stats",
-           "dump_scheduled", "dump_reserved", "dump_active",
+           "dump_schedule", "dump_reserved", "dump_active",
            "dump_revoked", "dump_tasks", "ping",
            "pool_grow", "pool_shrink", "autoscale",
            "shutdown", "add_consumer", "cancel_consumer",
-           "acvtive_queues"]
+           "active_queues"]
 
 TASK_INFO_FIELDS = ("exchange", "routing_key", "rate_limit")
 

+ 2 - 1
contrib/release/verify_config_reference.py

@@ -3,7 +3,8 @@ from sys import exit, stderr
 
 from celery.app.defaults import DEFAULTS
 
-ignore = frozenset(["BROKER_INSIST", "CELERYD_POOL_PUTLOCKS"])
+ignore = frozenset(["BROKER_INSIST", "CELERYD_POOL_PUTLOCKS",
+                    "CELERY_AMQP_TASK_RESULT_CONNECTION_MAX"])
 
 
 def find_undocumented_settings(directive=".. setting:: "):

+ 11 - 0
docs/internals/reference/celery.utils.functional.rst

@@ -0,0 +1,11 @@
+=====================================================
+ celery.utils.functional
+=====================================================
+
+.. contents::
+    :local:
+.. currentmodule:: celery.utils.functional
+
+.. automodule:: celery.utils.functional
+    :members:
+    :undoc-members:

+ 1 - 0
docs/internals/reference/index.rst

@@ -44,6 +44,7 @@
     celery.db.models
     celery.db.session
     celery.utils
+    celery.utils.functional
     celery.utils.term
     celery.utils.timeutils
     celery.utils.encoding