PEP8ify + pyflakes

celery/app/amqp.py

@@ -12,7 +12,6 @@ AMQ related functionality.
 from datetime import datetime, timedelta
 
 from kombu import BrokerConnection, Exchange
-from kombu.connection import Resource
 from kombu import compat as messaging
 from kombu.pools import ProducerPool
 from kombu.utils import cached_property

celery/backends/base.py

@@ -11,7 +11,7 @@ from celery.utils.serialization import pickle, get_pickled_exception
 from celery.utils.serialization import get_pickleable_exception
 from celery.utils.serialization import create_exception_cls
 from celery.datastructures import LocalCache
-from celery.app import app_or_default
+
 
 class BaseBackend(object):
     """Base backend class."""
@@ -70,7 +70,7 @@ class BaseBackend(object):
 
     def prepare_exception(self, exc):
         """Prepare exception for serialization."""
-        if (app_or_default().conf["CELERY_RESULT_SERIALIZER"] in ("pickle", "yaml")):
+        if (self.app.conf["CELERY_RESULT_SERIALIZER"] in ("pickle", "yaml")):
             return get_pickleable_exception(exc)
         return {
             "exc_type": type(exc).__name__,
@@ -79,9 +79,10 @@ class BaseBackend(object):
 
     def exception_to_python(self, exc):
         """Convert serialized exception to Python exception."""
-        if (app_or_default().conf["CELERY_RESULT_SERIALIZER"] in ("pickle", "yaml")):
+        if (self.app.conf["CELERY_RESULT_SERIALIZER"] in ("pickle", "yaml")):
             return get_pickled_exception(exc)
-        return create_exception_cls(exc["exc_type"].encode("utf-8"), sys.modules[__name__])
+        return create_exception_cls(exc["exc_type"].encode("utf-8"),
+                                    sys.modules[__name__])
 
     def prepare_value(self, result):
         """Prepare value for storage."""

celery/db/session.py

@@ -20,7 +20,7 @@ def get_engine(dburi, **kwargs):
 def create_session(dburi, **kwargs):
     engine = get_engine(dburi, **kwargs)
     if dburi not in _MAKERS:
-      _MAKERS[dburi] = sessionmaker(bind=engine)
+        _MAKERS[dburi] = sessionmaker(bind=engine)
     return engine, _MAKERS[dburi]
 
 

celery/tests/utils.py

@@ -54,7 +54,6 @@ def skip_unless_module(module):
     return _inner
 
 
-
 class AppCase(unittest.TestCase):
 
     def setUp(self):

celery/worker/autoscale.py

@@ -36,7 +36,8 @@ class Autoscaler(threading.Thread):
             if current > self.processes:
                 self.scale_up(current - self.processes)
             elif current < self.processes:
-                self.scale_down((self.processes - current) - self.min_concurrency)
+                self.scale_down(
+                    (self.processes - current) - self.min_concurrency)
 
     def update(self, max=None, min=None):
         with self.mutex: