Tests passing + flake8

celery/execute/trace.py

@@ -31,7 +31,6 @@ from .. import states, signals
 from ..app.task import BaseTask
 from ..datastructures import ExceptionInfo
 from ..exceptions import RetryTaskError
-from ..registry import tasks
 from ..utils.serialization import get_pickleable_exception
 
 send_prerun = signals.task_prerun.send

celery/platforms.py

@@ -11,6 +11,7 @@
 
 """
 from __future__ import absolute_import
+from __future__ import with_statement
 
 import errno
 import os

celery/tests/test_worker/__init__.py

@@ -554,14 +554,14 @@ class test_Consumer(Case):
         l.event_dispatcher = Mock()
         l.connection_errors = (socket.error, )
         l.logger = Mock()
-        m.ack = Mock()
-        m.ack.side_effect = socket.error("foo")
+        m.reject = Mock()
+        m.reject.side_effect = socket.error("foo")
         with self.assertWarnsRegex(RuntimeWarning, r'unknown message'):
             self.assertFalse(l.receive_message(m.decode(), m))
         with self.assertRaises(Empty):
             self.ready_queue.get_nowait()
         self.assertTrue(self.eta_schedule.empty())
-        m.ack.assert_called_with()
+        m.reject.assert_called_with()
         self.assertTrue(l.logger.critical.call_count)
 
     def test_receieve_message_eta(self):

celery/utils/dispatch/signal.py

@@ -83,7 +83,7 @@ class Signal(object):
 
                 if weak:
                     receiver = saferef.safe_ref(receiver,
-                                                on_delete=self._remove_receiver)
+                                            on_delete=self._remove_receiver)
 
                 for r_key, _ in self.receivers:
                     if r_key == lookup_key:

celery/utils/threads.py

@@ -42,7 +42,7 @@ class bgThread(Thread):
     def on_crash(self, exc_info, msg, *fmt, **kwargs):
         sys.stderr.write((msg + "\n") % fmt)
         traceback.print_exception(exc_info[0], exc_info[1], exc_info[2],
-                                  None, sys.__stderr__)
+                                  None, sys.stderr)
 
     def run(self):
         shutdown = self._is_shutdown

celery/worker/autoreload.py

@@ -156,7 +156,8 @@ class InotifyMonitor(_ProcessEvent):
             self._wm = pyinotify.WatchManager()
             self._notifier = pyinotify.Notifier(self._wm, self)
             for m in self._modules:
-                self._wm.add_watch(m, pyinotify.IN_MODIFY|pyinotify.IN_ATTRIB)
+                self._wm.add_watch(m,
+                        pyinotify.IN_MODIFY | pyinotify.IN_ATTRIB)
             self._notifier.loop()
         finally:
             if self._wm:

pavement.py

@@ -97,8 +97,7 @@ def flake8(options):
 ])
 def flakeplus(options):
     noerror = getattr(options, "noerror", False)
-    sh("python contrib/release/flakeplus.py celery",
-       ignore_error=noerror)
+    sh("flakeplus celery", ignore_error=noerror)
 
 
 @task