PEP8ify + pyflakes

celery/app/__init__.py

@@ -48,7 +48,6 @@ class AppPickler(object):
                     set_as_current=False,
                     accept_magic_kwargs=accept_magic_kwargs)
 
-
     def construct(self, cls, **kwargs):
         return cls(**kwargs)
 

celery/app/defaults.py

@@ -1,4 +1,3 @@
-import os
 import sys
 
 from datetime import timedelta

celery/backends/amqp.py

@@ -237,7 +237,7 @@ class AMQPBackend(BaseDictBackend):
 
     def __reduce__(self, args=(), kwargs={}):
         kwargs.update(
-            dict(connection=self._connection, 
+            dict(connection=self._connection,
                  exchange=self.exchange.name,
                  exchange_type=self.exchange.type,
                  persistent=self.persistent,

celery/backends/base.py

@@ -12,9 +12,10 @@ from celery.utils.serialization import get_pickleable_exception
 from celery.utils.serialization import create_exception_cls
 from celery.datastructures import LocalCache
 
+
 def unpickle_backend(cls, args, kwargs):
-  """Returns an unpickled backend."""
-  return cls(*args, **kwargs)
+    """Returns an unpickled backend."""
+    return cls(*args, **kwargs)
 
 
 class BaseBackend(object):
@@ -25,8 +26,9 @@ class BaseBackend(object):
 
     TimeoutError = TimeoutError
 
-    #: Time to sleep between polling each individual item in `ResultSet.iterate`.
-    #: as opposed to the `interval` argument which is for each pass.
+    #: Time to sleep between polling each individual item
+    #: in `ResultSet.iterate`. as opposed to the `interval`
+    #: argument which is for each pass.
     subpolling_interval = None
 
     def __init__(self, *args, **kwargs):

celery/backends/cache.py

@@ -98,7 +98,7 @@ class CacheBackend(KeyValueStoreBackend):
         servers = ";".join(self.servers)
         backend = "%s://%s/" % (self.backend, servers)
         kwargs.update(
-            dict(backend=backend, 
+            dict(backend=backend,
                  expires=self.expires,
                  options=self.options))
         return super(CacheBackend, self).__reduce__(args, kwargs)

celery/backends/cassandra.py

@@ -154,7 +154,7 @@ class CassandraBackend(BaseDictBackend):
 
     def __reduce__(self, args=(), kwargs={}):
         kwargs.update(
-            dict(servers=self.servers, 
+            dict(servers=self.servers,
                  keyspace=self.keyspace,
                  column_family=self.column_family,
                  cassandra_options=self.cassandra_options))

celery/backends/database.py

@@ -28,11 +28,13 @@ class DatabaseBackend(BaseDictBackend):
     def __init__(self, dburi=None, expires=None,
             engine_options=None, **kwargs):
         super(DatabaseBackend, self).__init__(**kwargs)
+        conf = self.app.conf
         self.expires = maybe_timedelta(self.prepare_expires(expires))
-        self.dburi = dburi or self.app.conf.CELERY_RESULT_DBURI
+        self.dburi = dburi or conf.CELERY_RESULT_DBURI
         self.engine_options = dict(engine_options or {},
-                        **self.app.conf.CELERY_RESULT_ENGINE_OPTIONS or {})
-        self.short_lived_sessions = self.app.conf.CELERY_RESULT_DB_SHORT_LIVED_SESSIONS
+                        **conf.CELERY_RESULT_ENGINE_OPTIONS or {})
+        self.short_lived_sessions = kwargs.get("short_lived_sessions",
+                                    conf.CELERY_RESULT_DB_SHORT_LIVED_SESSIONS)
         if not self.dburi:
             raise ImproperlyConfigured(
                     "Missing connection string! Do you have "
@@ -40,8 +42,8 @@ class DatabaseBackend(BaseDictBackend):
 
     def ResultSession(self):
         return ResultSession(
-                    dburi=self.dburi, 
-                    short_lived_sessions=self.short_lived_sessions, 
+                    dburi=self.dburi,
+                    short_lived_sessions=self.short_lived_sessions,
                     **self.engine_options)
 
     def _store_result(self, task_id, result, status, traceback=None):
@@ -132,7 +134,7 @@ class DatabaseBackend(BaseDictBackend):
 
     def __reduce__(self, args=(), kwargs={}):
         kwargs.update(
-            dict(dburi=self.dburi, 
+            dict(dburi=self.dburi,
                  expires=self.expires,
                  engine_options=self.engine_options))
         return super(DatabaseBackend, self).__reduce__(args, kwargs)

celery/backends/pyredis.py

@@ -23,11 +23,11 @@ class RedisBackend(redis.RedisBackend):
                                            password=redis_password))
 
     def __reduce__(self, args=(), kwargs={}):
-        # Not very usefull, but without the following, the redis_* attributes 
+        # Not very useful, but without the following, the redis_* attributes
         # would not be set.
         kwargs.update(
-            dict(redis_host=self.redis_host, 
-                 redis_port=redis_self.redis_port,
-                 redis_db=redis_self.redis_db,
+            dict(redis_host=self.redis_host,
+                 redis_port=self.redis_port,
+                 redis_db=self.redis_db,
                  redis_password=self.redis_password))
         return super(RedisBackend, self).__reduce__(args, kwargs)

celery/backends/redis.py

@@ -94,7 +94,7 @@ class RedisBackend(KeyValueStoreBackend):
 
     def __reduce__(self, args=(), kwargs={}):
         kwargs.update(
-            dict(host=self.host, 
+            dict(host=self.host,
                  port=self.port,
                  db=self.db,
                  password=self.password,

celery/backends/tyrant.py

@@ -85,6 +85,6 @@ class TyrantBackend(KeyValueStoreBackend):
 
     def __reduce__(self, args=(), kwargs={}):
         kwargs.update(
-            dict(tyrant_host=self.tyrant_host, 
+            dict(tyrant_host=self.tyrant_host,
                  tyrant_port=self.tyrant_port))
         return super(TyrantBackend, self).__reduce__(args, kwargs)

celery/beat.py

@@ -170,7 +170,8 @@ class Scheduler(object):
                                   traceback.format_stack(),
                                   exc_info=sys.exc_info())
             else:
-                self.logger.debug("%s sent. id->%s", entry.task, result.task_id)
+                self.logger.debug("%s sent. id->%s", entry.task,
+                                                     result.task_id)
         return next_time_to_run
 
     def tick(self):