Fix flakes from master

celery/bin/__init__.py

@@ -1,5 +1,3 @@
 from __future__ import absolute_import
 
-from collections import defaultdict
-
 from .base import Option  # noqa

celery/bootsteps.py

@@ -16,7 +16,7 @@ from kombu.common import ignore_errors
 from kombu.utils import symbol_by_name
 
 from .datastructures import DependencyGraph
-from .utils.imports import instantiate, qualname, symbol_by_name
+from .utils.imports import instantiate, qualname
 from .utils.log import get_logger
 from .utils.threads import default_socket_timeout
 

celery/tests/worker/test_control.py

@@ -439,7 +439,7 @@ class test_ControlPanel(Case):
         self.assertEqual([(('foo',), {}), (('bar',), {})],
                           _import.call_args_list)
 
-    def test_pool_restart_relaod_modules(self):
+    def test_pool_restart_reload_modules(self):
         consumer = Consumer()
         consumer.controller = _WC(app=current_app)
         consumer.controller.pool.restart = Mock()

celery/tests/worker/test_worker.py

@@ -186,19 +186,19 @@ class test_QoS(Case):
         self.assertEqual(qos.value, PREFETCH_COUNT_MAX - 1)
 
     def test_consumer_increment_decrement(self):
-        consumer = Mock()
-        qos = QoS(consumer, 10)
+        mconsumer = Mock()
+        qos = QoS(mconsumer, 10)
         qos.update()
         self.assertEqual(qos.value, 10)
-        consumer.qos.assert_called_with(prefetch_count=10)
+        mconsumer.qos.assert_called_with(prefetch_count=10)
         qos.decrement_eventually()
         qos.update()
         self.assertEqual(qos.value, 9)
-        consumer.qos.assert_called_with(prefetch_count=9)
+        mconsumer.qos.assert_called_with(prefetch_count=9)
         qos.decrement_eventually()
         self.assertEqual(qos.value, 8)
-        consumer.qos.assert_called_with(prefetch_count=9)
-        self.assertIn({'prefetch_count': 9}, consumer.qos.call_args)
+        mconsumer.qos.assert_called_with(prefetch_count=9)
+        self.assertIn({'prefetch_count': 9}, mconsumer.qos.call_args)
 
         # Does not decrement 0 value
         qos.value = 0
@@ -208,8 +208,8 @@ class test_QoS(Case):
         self.assertEqual(qos.value, 0)
 
     def test_consumer_decrement_eventually(self):
-        consumer = Mock()
-        qos = QoS(consumer, 10)
+        mconsumer = Mock()
+        qos = QoS(mconsumer, 10)
         qos.decrement_eventually()
         self.assertEqual(qos.value, 9)
         qos.value = 0
@@ -217,8 +217,8 @@ class test_QoS(Case):
         self.assertEqual(qos.value, 0)
 
     def test_set(self):
-        consumer = Mock()
-        qos = QoS(consumer, 10)
+        mconsumer = Mock()
+        qos = QoS(mconsumer, 10)
         qos.set(12)
         self.assertEqual(qos.prev, 12)
         qos.set(qos.prev)
@@ -662,7 +662,6 @@ class test_Consumer(Case):
         l = MyKombuConsumer(self.ready_queue, timer=self.timer, pool=pool)
         l.node = Mock()
         controller = find_step(l, consumer.Control)
-        box = controller.box
 
         class BConsumer(Mock):
 

celery/utils/text.py

@@ -13,8 +13,6 @@ from textwrap import fill
 
 from pprint import pformat
 
-from kombu.utils.encoding import safe_repr
-
 
 def dedent_initial(s, n=4):
     return s[n:] if s[:n] == ' ' * n else s