flakes

celery/concurrency/solo.py

@@ -20,8 +20,10 @@ class TaskPool(BasePool):
         self.limit = 1
 
     def _get_info(self):
-        return {'max-concurrency': 1,
-                'processes': [os.getpid()],
-                'max-tasks-per-child': None,
-                'put-guarded-by-semaphore': True,
-                'timeouts': ()}
+        return {
+            'max-concurrency': 1,
+            'processes': [os.getpid()],
+            'max-tasks-per-child': None,
+            'put-guarded-by-semaphore': True,
+            'timeouts': (),
+        }

celery/utils/term.py

@@ -54,14 +54,16 @@ class colored(object):
         self.s = s
         self.enabled = not IS_WINDOWS and kwargs.get('enabled', True)
         self.op = kwargs.get('op', '')
-        self.names = {'black': self.black,
-                      'red': self.red,
-                      'green': self.green,
-                      'yellow': self.yellow,
-                      'blue': self.blue,
-                      'magenta': self.magenta,
-                      'cyan': self.cyan,
-                      'white': self.white}
+        self.names = {
+            'black': self.black,
+            'red': self.red,
+            'green': self.green,
+            'yellow': self.yellow,
+            'blue': self.blue,
+            'magenta': self.magenta,
+            'cyan': self.cyan,
+            'white': self.white,
+        }
 
     def _add(self, a, b):
         return string(a) + string(b)

celery/worker/request.py

@@ -220,9 +220,14 @@ class Request(object):
         # pylint: disable=unpacking-non-sequence
         #    payload is a property, so pylint doesn't think it's a tuple.
         args, kwargs, embed = self._payload
-        request.update({'loglevel': loglevel, 'logfile': logfile,
-                        'hostname': self.hostname, 'is_eager': False,
-                        'args': args, 'kwargs': kwargs}, **embed or {})
+        request.update({
+            'loglevel': loglevel,
+            'logfile': logfile,
+            'hostname': self.hostname,
+            'is_eager': False,
+            'args': args,
+            'kwargs': kwargs
+        }, **embed or {})
         retval = trace_task(self.task, self.id, args, kwargs, request,
                             hostname=self.hostname, loader=self.app.loader,
                             app=self.app)[0]

t/benchmarks/bench_worker.py

@@ -14,18 +14,18 @@ from kombu.five import monotonic  # noqa
 
 DEFAULT_ITS = 40000
 
-BROKER_TRANSPORT = os.environ.get('BROKER', 'librabbitmq')
+BROKER_TRANSPORT = os.environ.get('BROKER', 'librabbitmq://')
 if hasattr(sys, 'pypy_version_info'):
-    BROKER_TRANSPORT = 'pyamqp'
+    BROKER_TRANSPORT = 'pyamqp://'
 
 app = Celery('bench_worker')
 app.conf.update(
-    broker_transport=BROKER_TRANSPORT,
+    broker_url=BROKER_TRANSPORT,
     broker_pool_limit=10,
-    celeryd_pool='solo',
-    celeryd_prefetch_multiplier=0,
-    default_delivery_mode=1,
-    queues={
+    worker_pool='solo',
+    worker_prefetch_multiplier=0,
+    task_default_delivery_mode=1,
+    task_queues={
         'bench.worker': {
             'exchange': 'bench.worker',
             'routing_key': 'bench.worker',
@@ -36,7 +36,7 @@ app.conf.update(
         }
     },
     task_serializer='json',
-    default_queue='bench.worker',
+    task_default_queue='bench.worker',
     result_backend=None,
 ),
 

t/unit/app/test_backends.py

@@ -17,16 +17,16 @@ class test_backends:
         ('cache+memory://', CacheBackend),
     ])
     def test_get_backend_aliases(self, url, expect_cls, app):
-        backend, url = backends.by_url(url)
+        backend, url = backends.by_url(url, app.loader)
         assert isinstance(backend(app=app, url=url), expect_cls)
 
     def test_unknown_backend(self, app):
         with pytest.raises(ImportError):
-            backends.by_name('fasodaopjeqijwqe')
+            backends.by_name('fasodaopjeqijwqe', app.loader)
 
     def test_backend_by_url(self, app, url='redis://localhost/1'):
         from celery.backends.redis import RedisBackend
-        backend, url_ = backends.by_url(url)
+        backend, url_ = backends.by_url(url, app.loader)
         assert backend is RedisBackend
         assert url_ == url
 
@@ -34,4 +34,4 @@ class test_backends:
         with patch('celery.app.backends.symbol_by_name') as sbn:
             sbn.side_effect = ValueError()
             with pytest.raises(ImproperlyConfigured):
-                backends.by_name('xxx.xxx:foo')
+                backends.by_name('xxx.xxx:foo', app.loader)