fixed stuff reported by pyflakes

celery/backends/amqp.py

@@ -2,10 +2,8 @@
 from carrot.messaging import Consumer, Publisher
 
 from celery import conf
-from celery import states
 from celery.backends.base import BaseDictBackend
 from celery.messaging import establish_connection
-from celery.datastructures import LocalCache
 
 
 class AMQPBackend(BaseDictBackend):

celery/backends/base.py

@@ -1,6 +1,5 @@
 """celery.backends.base"""
 import time
-from UserDict import UserDict
 
 from billiard.serialization import pickle
 from billiard.serialization import get_pickled_exception
@@ -182,7 +181,7 @@ class BaseDictBackend(BaseBackend):
         self._cache[task_id] = self.get_task_meta(task_id, cache=False)
 
     def reload_taskset_result(self, taskset_id):
-        self._cache[taskset_id] = self.get_taskset_meta(task_id, cache=False)
+        self._cache[taskset_id] = self.get_taskset_meta(taskset_id, cache=False)
 
     def get_taskset_meta(self, taskset_id, cache=True):
         if cache and taskset_id in self._cache:

celery/backends/database.py

@@ -1,4 +1,3 @@
-from celery import states
 from celery.models import TaskMeta, TaskSetMeta
 from celery.backends.base import BaseDictBackend
 

celery/backends/mongodb.py

@@ -46,20 +46,20 @@ class MongoBackend(BaseDictBackend):
 
         settings = load_settings()
 
-        conf = getattr(settings, "CELERY_MONGODB_BACKEND_SETTINGS", None)
-        if conf is not None:
-            if not isinstance(conf, dict):
+        config = getattr(settings, "CELERY_MONGODB_BACKEND_SETTINGS", None)
+        if config is not None:
+            if not isinstance(config, dict):
                 raise ImproperlyConfigured(
                     "MongoDB backend settings should be grouped in a dict")
 
-            self.mongodb_host = conf.get('host', self.mongodb_host)
-            self.mongodb_port = int(conf.get('port', self.mongodb_port))
-            self.mongodb_user = conf.get('user', self.mongodb_user)
-            self.mongodb_password = conf.get(
+            self.mongodb_host = config.get('host', self.mongodb_host)
+            self.mongodb_port = int(config.get('port', self.mongodb_port))
+            self.mongodb_user = config.get('user', self.mongodb_user)
+            self.mongodb_password = config.get(
                     'password', self.mongodb_password)
-            self.mongodb_database = conf.get(
+            self.mongodb_database = config.get(
                     'database', self.mongodb_database)
-            self.mongodb_taskmeta_collection = conf.get(
+            self.mongodb_taskmeta_collection = config.get(
                 'taskmeta_collection', self.mongodb_taskmeta_collection)
 
         super(MongoBackend, self).__init__(*args, **kwargs)

celery/datastructures.py

@@ -5,7 +5,6 @@ Custom Datastructures
 
 """
 import time
-import heapq
 import traceback
 from UserList import UserList
 from Queue import Queue, Empty as QueueEmpty

celery/execute/__init__.py

@@ -1,5 +1,3 @@
-from datetime import datetime, timedelta
-
 from celery import conf
 from celery.utils import gen_unique_id, fun_takes_kwargs, mattrgetter
 from celery.result import AsyncResult, EagerResult

celery/managers.py

@@ -7,8 +7,6 @@ from django.db import models
 from django.db import transaction
 from django.db.models.query import QuerySet
 
-from celery import states
-
 
 def transaction_retry(max_retries=1):
     """Decorator for methods doing database operations.

celery/models.py

@@ -1,6 +1,5 @@
 import django
 from django.db import models
-from django.forms.models import model_to_dict
 from django.utils.translation import ugettext_lazy as _
 
 from picklefield.fields import PickledObjectField

celery/utils/__init__.py

@@ -12,7 +12,7 @@ except ImportError:
     ctypes = None
 from uuid import UUID, uuid4, _uuid_generate_random
 from inspect import getargspec
-from itertools import repeat, islice
+from itertools import islice
 
 from billiard.utils.functional import curry
 

celery/utils/compat.py

@@ -36,6 +36,8 @@ try:
     from collections import MutableMapping
 except ImportError:
     from UserDict import DictMixin as MutableMapping
+from itertools import imap as _imap
+from operator import eq as _eq
 
 
 class _Link(object):

celery/worker/listener.py

@@ -7,7 +7,6 @@ from dateutil.parser import parse as parse_iso8601
 from carrot.connection import AMQPConnectionException
 
 from celery import conf
-from celery import signals
 from celery.utils import noop, retry_over_time
 from celery.worker.job import TaskWrapper, InvalidTaskError
 from celery.worker.revoke import revoked

celery/worker/pool.py

@@ -7,7 +7,6 @@ from billiard.pool import DynamicPool
 from billiard.utils.functional import curry
 
 from celery import log
-from celery.utils import noop
 from celery.datastructures import ExceptionInfo