Browse Source

cosmetics

Ask Solem 10 years ago
parent
commit
fcf3ff1b4f

+ 2 - 2
celery/app/base.py

@@ -52,9 +52,9 @@ from . import builtins  # noqa
 __all__ = ['Celery']
 
 _EXECV = os.environ.get('FORKED_BY_MULTIPROCESSING')
-BUILTIN_FIXUPS = frozenset([
+BUILTIN_FIXUPS = {
     'celery.fixups.django:fixup',
-])
+}
 
 ERR_ENVVAR_NOT_SET = """\
 The environment variable {0!r} is not set,

+ 1 - 1
celery/app/trace.py

@@ -104,7 +104,7 @@ REJECTED = states.REJECTED
 RETRY = states.RETRY
 FAILURE = states.FAILURE
 EXCEPTION_STATES = states.EXCEPTION_STATES
-IGNORE_STATES = frozenset([IGNORED, RETRY, REJECTED])
+IGNORE_STATES = frozenset({IGNORED, RETRY, REJECTED})
 
 #: set by :func:`setup_worker_optimizations`
 _localized = []

+ 1 - 1
celery/backends/base.py

@@ -43,7 +43,7 @@ from celery.utils.serialization import (
 
 __all__ = ['BaseBackend', 'KeyValueStoreBackend', 'DisabledBackend']
 
-EXCEPTION_ABLE_CODECS = frozenset(['pickle'])
+EXCEPTION_ABLE_CODECS = frozenset({'pickle'})
 PY3 = sys.version_info >= (3, 0)
 
 logger = get_logger(__name__)

+ 1 - 1
celery/concurrency/asynpool.py

@@ -76,7 +76,7 @@ except (ImportError, NameError):  # pragma: no cover
 logger = get_logger(__name__)
 error, debug = logger.error, logger.debug
 
-UNAVAIL = frozenset([errno.EAGAIN, errno.EINTR])
+UNAVAIL = frozenset({errno.EAGAIN, errno.EINTR})
 
 #: Constant sent by child process when started (ready to accept work)
 WORKER_UP = 15

+ 4 - 6
celery/concurrency/prefork.py

@@ -27,14 +27,12 @@ from .asynpool import AsynPool
 __all__ = ['TaskPool', 'process_initializer', 'process_destructor']
 
 #: List of signals to reset when a child process starts.
-WORKER_SIGRESET = frozenset(['SIGTERM',
-                             'SIGHUP',
-                             'SIGTTIN',
-                             'SIGTTOU',
-                             'SIGUSR1'])
+WORKER_SIGRESET = {
+    'SIGTERM', 'SIGHUP', 'SIGTTIN', 'SIGTTOU', 'SIGUSR1',
+}
 
 #: List of signals to ignore when a child process starts.
-WORKER_SIGIGNORE = frozenset(['SIGINT'])
+WORKER_SIGIGNORE = {'SIGINT'}
 
 logger = get_logger(__name__)
 warning, debug = logger.warning, logger.debug

+ 6 - 6
celery/states.py

@@ -144,10 +144,10 @@ RETRY = 'RETRY'
 IGNORED = 'IGNORED'
 REJECTED = 'REJECTED'
 
-READY_STATES = frozenset([SUCCESS, FAILURE, REVOKED])
-UNREADY_STATES = frozenset([PENDING, RECEIVED, STARTED, RETRY])
-EXCEPTION_STATES = frozenset([RETRY, FAILURE, REVOKED])
-PROPAGATE_STATES = frozenset([FAILURE, REVOKED])
+READY_STATES = frozenset({SUCCESS, FAILURE, REVOKED})
+UNREADY_STATES = frozenset({PENDING, RECEIVED, STARTED, RETRY})
+EXCEPTION_STATES = frozenset({RETRY, FAILURE, REVOKED})
+PROPAGATE_STATES = frozenset({FAILURE, REVOKED})
 
-ALL_STATES = frozenset([PENDING, RECEIVED, STARTED,
-                        SUCCESS, FAILURE, RETRY, REVOKED])
+ALL_STATES = frozenset({PENDING, RECEIVED, STARTED,
+                        SUCCESS, FAILURE, RETRY, REVOKED})

+ 1 - 1
celery/task/http.py

@@ -25,7 +25,7 @@ from celery.utils.log import get_task_logger
 __all__ = ['InvalidResponseError', 'RemoteExecuteError', 'UnknownStatusError',
            'HttpDispatch', 'dispatch', 'URL']
 
-GET_METHODS = frozenset(['GET', 'HEAD'])
+GET_METHODS = {'GET', 'HEAD'}
 logger = get_task_logger(__name__)
 
 

+ 0 - 1
celery/tests/app/test_loaders.py

@@ -263,7 +263,6 @@ class test_autodiscovery(Case):
                 imp.return_value.__path__ = 'foo'
                 base.find_related_module(base, 'tasks')
 
-
                 def se1(val):
                     imp.side_effect = AttributeError()
 

+ 1 - 1
celery/tests/worker/test_control.py

@@ -141,7 +141,7 @@ class test_ControlPanel(AppCase):
         evd.groups = set()
         panel.handle('enable_events')
         self.assertFalse(evd.groups)
-        evd.groups = set(['worker'])
+        evd.groups = {'worker'}
         panel.handle('enable_events')
         self.assertIn('task', evd.groups)
         evd.groups = {'task'}

+ 2 - 2
extra/release/verify_config_reference.py

@@ -5,7 +5,7 @@ from sys import exit, stderr
 
 from celery.app.defaults import NAMESPACES, flatten
 
-ignore = frozenset([
+ignore = {
     'CELERYD_AGENT',
     'CELERYD_POOL_PUTLOCKS',
     'BROKER_HOST',
@@ -18,7 +18,7 @@ ignore = frozenset([
     'CELERY_REDIS_PORT',
     'CELERY_REDIS_DB',
     'CELERY_REDIS_PASSWORD',
-])
+}
 
 
 def is_ignored(setting, option):