PEP8ify: Group imports

celery/backends/__init__.py

@@ -1,7 +1,8 @@
 """celery.backends"""
+import sys
 from functools import partial
+
 from celery import conf
-import sys
 
 
 def get_backend_cls(backend):

celery/backends/amqp.py

@@ -1,6 +1,7 @@
 """celery.backends.amqp"""
-from carrot.connection import DjangoBrokerConnection
 from carrot.messaging import Consumer, Publisher
+from carrot.connection import DjangoBrokerConnection
+
 from celery.backends.base import BaseBackend
 
 RESULTSTORE_EXCHANGE = "celeryresults"

celery/backends/base.py

@@ -1,9 +1,10 @@
 """celery.backends.base"""
 import time
+
+from celery.exceptions import TimeoutError
 from celery.serialization import pickle
 from celery.serialization import get_pickled_exception
 from celery.serialization import get_pickleable_exception
-from celery.exceptions import TimeoutError
 
 EXCEPTION_STATES = frozenset(["RETRY", "FAILURE"])
 

celery/backends/cache.py

@@ -1,9 +1,10 @@
 """celery.backends.cache"""
+from django.utils.encoding import smart_str
 from django.core.cache import cache, get_cache
 from django.core.cache.backends.base import InvalidCacheBackendError
-from django.utils.encoding import smart_str
-from celery.backends.base import KeyValueStoreBackend
+
 from celery import conf
+from celery.backends.base import KeyValueStoreBackend
 
 # CELERY_CACHE_BACKEND overrides the django-global(tm) backend settings.
 if conf.CELERY_CACHE_BACKEND:

celery/backends/mongodb.py

@@ -1,16 +1,17 @@
 """MongoDB backend for celery."""
 from datetime import datetime
-from django.core.exceptions import ImproperlyConfigured
-from celery.serialization import pickle
-from celery.backends.base import BaseBackend
-from celery.loaders import settings
-from celery.conf import TASK_RESULT_EXPIRES
 
+from django.core.exceptions import ImproperlyConfigured
 try:
     import pymongo
 except ImportError:
     pymongo = None
 
+from celery.serialization import pickle
+from celery.backends.base import BaseBackend
+from celery.loaders import settings
+from celery.conf import TASK_RESULT_EXPIRES
+
 
 class Bunch:
 

celery/backends/redis.py

@@ -1,13 +1,13 @@
 """celery.backends.tyrant"""
 from django.core.exceptions import ImproperlyConfigured
 from celery.backends.base import KeyValueStoreBackend
-from celery.loaders import settings
-
 try:
     import redis
 except ImportError:
     redis = None
 
+from celery.loaders import settings
+
 
 class Backend(KeyValueStoreBackend):
     """Redis based task backend store.

celery/backends/tyrant.py

@@ -1,13 +1,13 @@
 """celery.backends.tyrant"""
 from django.core.exceptions import ImproperlyConfigured
-from celery.backends.base import KeyValueStoreBackend
-from celery.loaders import settings
-
 try:
     import pytyrant
 except ImportError:
     pytyrant = None
 
+from celery.backends.base import KeyValueStoreBackend
+from celery.loaders import settings
+
 
 class Backend(KeyValueStoreBackend):
     """Tokyo Cabinet based task backend store.

celery/beat.py

@@ -4,13 +4,13 @@ import atexit
 import threading
 from UserDict import UserDict
 from datetime import datetime
+
 from celery import conf
 from celery import registry
 from celery.log import setup_logger
 from celery.exceptions import NotRegistered
 
 
-
 class SchedulingError(Exception):
     """An error occured while scheduling task."""
 

celery/bin/celerybeat.py

@@ -45,9 +45,10 @@ import os
 import sys
 import traceback
 import optparse
-from celery import __version__
+
 from celery import conf
 from celery import platform
+from celery import __version__
 from celery.log import emergency_error
 from celery.beat import ClockService
 from celery.loaders import current_loader, settings

celery/bin/celeryd.py

@@ -71,16 +71,18 @@ import sys
 import multiprocessing
 import traceback
 import optparse
+
 from carrot.connection import DjangoBrokerConnection
-from celery.loaders import current_loader
-from celery.loaders import settings
-from celery import __version__
+
 from celery import conf
 from celery import platform
+from celery import __version__
 from celery.log import emergency_error
 from celery.task import discard_all
 from celery.worker import WorkController
 from celery.loaders import current_loader, settings
+from celery.loaders import current_loader
+from celery.loaders import settings
 from celery.supervisor import OFASupervisor
 
 USE_STATISTICS = getattr(settings, "CELERY_STATISTICS", False)

celery/bin/celeryinit.py

@@ -1,3 +1,4 @@
+import sys
 
 
 def main():
@@ -5,7 +6,7 @@ def main():
     loader = Loader()
     conf = loader.read_configuration()
     from django.core.management import call_command, setup_environ
-    print("Creating database tables...")
+    sys.stderr.write("Creating database tables...\n")
     setup_environ(conf)
     call_command("syncdb")
 

celery/buckets.py

@@ -1,6 +1,5 @@
 import time
-from Queue import Queue
-from Queue import Empty as QueueEmpty
+from Queue import Queue, Empty as QueueEmpty
 
 RATE_MODIFIER_MAP = {"s": lambda n: n,
                      "m": lambda n: n / 60.0,

celery/conf.py

@@ -1,8 +1,8 @@
+import logging
+from datetime import timedelta
+
 from celery.registry import tasks
-"""celery.conf"""
 from celery.loaders import settings
-from datetime import timedelta
-import logging
 
 DEFAULT_AMQP_EXCHANGE = "celery"
 DEFAULT_AMQP_PUBLISHER_ROUTING_KEY = "celery"

celery/datastructures.py

@@ -3,10 +3,9 @@
 Custom Datastructures
 
 """
-from UserList import UserList
-from Queue import Queue
-from Queue import Empty as QueueEmpty
 import traceback
+from UserList import UserList
+from Queue import Queue, Empty as QueueEmpty
 
 
 class PositionQueue(UserList):

celery/decorators.py

@@ -1,6 +1,7 @@
-from celery.task.base import Task
 from inspect import getargspec
 
+from celery.task.base import Task
+
 
 def task(**options):
     """Make a task out of any callable.

celery/execute.py

@@ -1,17 +1,19 @@
+import sys
+import inspect
+import traceback
+from datetime import datetime, timedelta
+
 from carrot.connection import DjangoBrokerConnection
+
+from celery import signals
 from celery.conf import AMQP_CONNECTION_TIMEOUT
-from celery.result import AsyncResult, EagerResult
-from celery.messaging import TaskPublisher
-from celery.registry import tasks
 from celery.utils import gen_unique_id, noop, fun_takes_kwargs
 from celery.utils.functional import curry
-from datetime import datetime, timedelta
+from celery.result import AsyncResult, EagerResult
+from celery.registry import tasks
+from celery.messaging import TaskPublisher
 from celery.exceptions import RetryTaskError
 from celery.datastructures import ExceptionInfo
-from celery import signals
-import sys
-import inspect
-import traceback
 
 
 def apply_async(task, args=None, kwargs=None, countdown=None, eta=None,

celery/loaders/__init__.py

@@ -1,9 +1,11 @@
 import os
-from celery.loaders.djangoapp import Loader as DjangoLoader
-from celery.loaders.default import Loader as DefaultLoader
+
 from django.conf import settings
 from django.core.management import setup_environ
 
+from celery.loaders.default import Loader as DefaultLoader
+from celery.loaders.djangoapp import Loader as DjangoLoader
+
 """
 .. class:: Loader
 

celery/loaders/default.py

@@ -1,4 +1,5 @@
 import os
+
 from celery.loaders.base import BaseLoader
 
 DEFAULT_CONFIG_MODULE = "celeryconfig"

celery/log.py

@@ -4,6 +4,7 @@ import sys
 import time
 import logging
 import traceback
+
 from celery import conf
 
 

celery/management/commands/celerybeat.py

@@ -4,6 +4,7 @@ Start the celery clock service from the Django management command.
 
 """
 from django.core.management.base import BaseCommand
+
 from celery.bin.celerybeat import run_clockservice, OPTION_LIST
 
 

celery/management/commands/celeryd.py

@@ -4,6 +4,7 @@ Start the celery daemon from the Django management command.
 
 """
 from django.core.management.base import BaseCommand
+
 from celery.bin.celeryd import run_worker, OPTION_LIST
 
 

celery/management/commands/celerystats.py

@@ -4,6 +4,7 @@ Start the celery daemon from the Django management command.
 
 """
 from django.core.management.base import BaseCommand
+
 from celery.monitoring import StatsCollector
 
 

celery/managers.py

@@ -1,9 +1,9 @@
 """celery.managers"""
+from datetime import datetime
 from django.db import models
 from django.db import transaction
+
 from celery.conf import TASK_RESULT_EXPIRES
-from datetime import datetime
-from django.conf import settings
 
 
 class TaskManager(models.Manager):

celery/messaging.py

@@ -4,6 +4,7 @@ Sending and Receiving Messages
 
 """
 from carrot.messaging import Publisher, Consumer, ConsumerSet
+
 from celery import conf
 from celery import signals
 from celery.utils import gen_unique_id

celery/models.py

@@ -3,14 +3,16 @@
 Django Models.
 
 """
+from datetime import datetime
+
 import django
 from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+from celery import conf
+from celery.fields import PickledObjectField
 from celery.registry import tasks
 from celery.managers import TaskManager
-from celery.fields import PickledObjectField
-from celery import conf
-from django.utils.translation import ugettext_lazy as _
-from datetime import datetime
 
 TASK_STATUS_PENDING = "PENDING"
 TASK_STATUS_RETRY = "RETRY"

celery/monitoring.py

@@ -3,11 +3,13 @@
     Publishing Statistics and Monitoring Celery.
 
 """
+import time
+
+from django.core.cache import cache
 from carrot.connection import DjangoBrokerConnection
-from celery.messaging import StatsPublisher, StatsConsumer
+
 from celery.loaders import settings
-from django.core.cache import cache
-import time
+from celery.messaging import StatsPublisher, StatsConsumer
 
 DEFAULT_CACHE_KEY_PREFIX = "celery-statistics"
 

celery/pool.py

@@ -6,12 +6,12 @@ Process Pools.
 import os
 import errno
 import multiprocessing
-
 from multiprocessing.pool import Pool, worker
-from celery.datastructures import ExceptionInfo
+from operator import isNumberType
+
 from celery.utils import noop
 from celery.utils.functional import curry
-from operator import isNumberType
+from celery.datastructures import ExceptionInfo
 
 
 def pid_is_dead(pid):

celery/registry.py

@@ -1,8 +1,9 @@
 """celery.registry"""
+import inspect
+from UserDict import UserDict
+
 from celery import discovery
 from celery.exceptions import NotRegistered, AlreadyRegistered
-from UserDict import UserDict
-import inspect
 
 
 class TaskRegistry(UserDict):

celery/result.py

@@ -3,11 +3,12 @@
 Asynchronous result types.
 
 """
+import time
+from itertools import imap
+
 from celery.backends import default_backend
-from celery.datastructures import PositionQueue
 from celery.exceptions import TimeoutError
-from itertools import imap
-import time
+from celery.datastructures import PositionQueue
 
 
 class BaseAsyncResult(object):

celery/serialization.py

@@ -1,10 +1,11 @@
-from celery.utils.functional import curry
 import operator
 try:
     import cPickle as pickle
 except ImportError:
     import pickle
 
+from celery.utils.functional import curry
+
 
 def find_nearest_pickleable_exception(exc):
     """With an exception instance, iterate over its super classes (by mro)

celery/supervisor.py

@@ -1,5 +1,5 @@
-import multiprocessing
 import time
+import multiprocessing
 from multiprocessing import TimeoutError
 
 JOIN_TIMEOUT = 2

celery/task/__init__.py

@@ -4,17 +4,17 @@ Working with tasks and task sets.
 
 """
 from carrot.connection import DjangoBrokerConnection
-from celery.messaging import TaskConsumer
+
 from celery.conf import AMQP_CONNECTION_TIMEOUT
+from celery.execute import apply_async
 from celery.registry import tasks
 from celery.backends import default_backend
+from celery.messaging import TaskConsumer
 from celery.task.base import Task, TaskSet, PeriodicTask
-from celery.task.base import ExecuteRemoteTask
-from celery.task.base import AsynchronousMapTask
+from celery.task.base import ExecuteRemoteTask, AsynchronousMapTask
+from celery.task.rest import RESTProxyTask
 from celery.task.builtins import DeleteExpiredTaskMetaTask, PingTask
-from celery.execute import apply_async
 from celery.serialization import pickle
-from celery.task.rest import RESTProxyTask
 
 
 def discard_all(connect_timeout=AMQP_CONNECTION_TIMEOUT):

celery/task/base.py

@@ -1,16 +1,18 @@
+import sys
+from datetime import timedelta
+
 from carrot.connection import DjangoBrokerConnection
+
 from celery import conf
-from celery.messaging import TaskPublisher, TaskConsumer
 from celery.log import setup_logger
+from celery.utils import gen_unique_id, get_full_cls_name
 from celery.result import TaskSetResult, EagerResult
 from celery.execute import apply_async, apply
-from celery.utils import gen_unique_id, get_full_cls_name
 from celery.registry import tasks
 from celery.backends import default_backend
-from celery.serialization import pickle
+from celery.messaging import TaskPublisher, TaskConsumer
 from celery.exceptions import MaxRetriesExceededError, RetryTaskError
-from datetime import timedelta
-import sys
+from celery.serialization import pickle
 
 
 class TaskType(type):

celery/task/builtins.py

@@ -1,7 +1,8 @@
+from datetime import timedelta
+
 from celery.task.base import Task, PeriodicTask
-from celery.registry import tasks
 from celery.backends import default_backend
-from datetime import timedelta
+from celery.registry import tasks
 
 
 class DeleteExpiredTaskMetaTask(PeriodicTask):

celery/task/rest.py

@@ -1,11 +1,13 @@
-from celery.task.base import Task as BaseTask
-from celery.registry import tasks
-from celery import __version__ as celery_version
+import urllib2
 from cgi import parse_qsl
 from urllib import urlencode
 from urlparse import urlparse
+
 from anyjson import serialize, deserialize
-import urllib2
+
+from celery import __version__ as celery_version
+from celery.registry import tasks
+from celery.task.base import Task as BaseTask
 
 
 class InvalidResponseError(Exception):

celery/task/strategy.py

@@ -1,4 +1,5 @@
 from carrot.connection import DjangoBrokerConnection
+
 from celery.utils import chunks
 
 

celery/urls.py

@@ -4,6 +4,7 @@ URLs defined for celery.
 
 """
 from django.conf.urls.defaults import patterns, url
+
 from celery import views
 
 

celery/utils/__init__.py

@@ -4,15 +4,16 @@ Utility functions
 
 """
 import time
-from itertools import repeat
-from inspect import getargspec
-from uuid import UUID, uuid4, _uuid_generate_random
-from celery.utils.functional import curry
 import operator
 try:
     import ctypes
 except ImportError:
     ctypes = None
+from uuid import UUID, uuid4, _uuid_generate_random
+from inspect import getargspec
+from itertools import repeat
+
+from celery.utils.functional import curry
 
 noop = lambda *args, **kwargs: None
 

celery/views.py

@@ -1,8 +1,9 @@
 """celery.views"""
+from anyjson import serialize as JSON_dump
 from django.http import HttpResponse, Http404
+
 from celery.task import tasks, is_successful, apply_async
 from celery.result import AsyncResult
-from anyjson import serialize as JSON_dump
 
 
 def apply(request, task_name, *args):

celery/worker/__init__.py

@@ -3,24 +3,26 @@
 The Multiprocessing Worker Server
 
 """
+import traceback
+import logging
+import socket
+from Queue import Queue
+
 from carrot.connection import DjangoBrokerConnection, AMQPConnectionException
-from celery.worker.controllers import Mediator, ScheduleController
+
+from celery import conf
+from celery import registry
+from celery.log import setup_logger
+from celery.pool import TaskPool
 from celery.beat import ClockServiceThread
+from celery.utils import retry_over_time
 from celery.worker.job import TaskWrapper
 from celery.worker.scheduler import Scheduler
-from celery.exceptions import NotRegistered
+from celery.worker.controllers import Mediator, ScheduleController
+from celery.buckets import TaskBucket
 from celery.messaging import get_consumer_set
-from celery.log import setup_logger
-from celery.pool import TaskPool
-from celery.utils import retry_over_time
+from celery.exceptions import NotRegistered
 from celery.datastructures import SharedCounter
-from celery import registry
-from celery import conf
-from celery.buckets import TaskBucket
-from Queue import Queue
-import traceback
-import logging
-import socket
 
 
 class CarrotListener(object):

celery/worker/controllers.py

@@ -3,11 +3,12 @@
 Worker Controller Threads
 
 """
+import time
+import threading
 from Queue import Empty as QueueEmpty
 from datetime import datetime
+
 from celery.log import get_default_logger
-import threading
-import time
 
 
 class BackgroundThread(threading.Thread):

celery/worker/job.py

@@ -3,18 +3,20 @@
 Jobs Executable by the Worker Server.
 
 """
+import sys
+import socket
+import warnings
+
+from django.core.mail import mail_admins
+
+from celery.log import get_default_logger
+from celery.utils import noop, fun_takes_kwargs
+from celery.loaders import current_loader
+from celery.execute import TaskTrace
 from celery.registry import tasks
 from celery.exceptions import NotRegistered
-from celery.execute import TaskTrace
-from celery.utils import noop, fun_takes_kwargs
-from celery.log import get_default_logger
 from celery.monitoring import TaskTimerStats
-from django.core.mail import mail_admins
-from celery.loaders import current_loader
 from celery.datastructures import ExceptionInfo
-import sys
-import socket
-import warnings
 
 # pep8.py borks on a inline signature separator and
 # says "trailing whitespace" ;)

celery/worker/scheduler.py

@@ -1,5 +1,5 @@
-import heapq
 import time
+import heapq
 
 
 class Scheduler(object):