Ask Solem 14 years ago
parent
commit
12cfb3a55c

+ 1 - 2
celery/app/base.py

@@ -1,4 +1,3 @@
-import os
 import sys
 
 from datetime import timedelta
@@ -240,7 +239,7 @@ class BaseApp(object):
         if not c.get("CELERY_RESULT_BACKEND"):
             rbackend = c.get("CELERY_BACKEND")
             if rbackend:
-                c["CELERY_RESULT_BACKEND"] = backend
+                c["CELERY_RESULT_BACKEND"] = rbackend
         if not c.get("BROKER_BACKEND"):
             cbackend = c.get("BROKER_TRANSPORT") or c.get("CARROT_BACKEND")
             if cbackend:

+ 0 - 1
celery/apps/worker.py

@@ -4,7 +4,6 @@ import platform as _platform
 import os
 import socket
 import sys
-import warnings
 
 from celery import __version__
 from celery import platform

+ 1 - 1
celery/bin/camqadm.py

@@ -8,7 +8,7 @@ import cmd
 import sys
 import shlex
 import pprint
-import optparse
+
 from itertools import count
 
 from amqplib import client_0_8 as amqp

+ 1 - 3
celery/bin/celeryctl.py

@@ -1,14 +1,12 @@
-import os
 import sys
 
 from optparse import OptionParser, make_option as Option
-from pprint import pprint, pformat
+from pprint import pformat
 from textwrap import wrap
 
 from anyjson import deserialize
 
 from celery import __version__
-from celery import CompatCelery
 from celery.app import app_or_default
 from celery.bin.base import Command as CeleryCommand
 from celery.utils import term

+ 0 - 1
celery/bin/celeryd.py

@@ -69,7 +69,6 @@
 """
 import multiprocessing
 
-from celery import __version__
 from celery.bin.base import Command, Option
 
 

+ 0 - 10
celery/bin/celeryev.py

@@ -1,12 +1,3 @@
-import logging
-import sys
-
-from celery import CompatCelery
-from celery.app import app_or_default
-from celery.events.cursesmon import evtop
-from celery.events.dumper import evdump
-from celery.events.snapshot import evcam
-
 from celery.bin.base import Command, Option
 
 
@@ -35,7 +26,6 @@ class EvCommand(Command):
         return evcam(*args, **kwargs)
 
     def get_options(self):
-        conf = self.app.conf
         return (
             Option('-d', '--dump',
                    action="store_true", dest="dump",

+ 0 - 2
celery/decorators.py

@@ -3,8 +3,6 @@
 Decorators
 
 """
-from inspect import getargspec
-
 from celery.app import app_or_default
 from celery.task.base import PeriodicTask
 

+ 0 - 3
celery/loaders/app.py

@@ -1,7 +1,4 @@
 import os
-import sys
-
-from importlib import import_module
 
 from celery.datastructures import DictAttribute
 from celery.exceptions import ImproperlyConfigured

+ 0 - 1
celery/loaders/default.py

@@ -1,5 +1,4 @@
 import os
-import sys
 import warnings
 from importlib import import_module
 

+ 0 - 3
celery/log.py

@@ -1,8 +1,6 @@
 """celery.log"""
 import logging
 import threading
-import time
-import os
 import sys
 import traceback
 
@@ -11,7 +9,6 @@ from multiprocessing import util as mputil
 
 from celery import signals
 from celery.app import app_or_default
-from celery.utils import noop
 from celery.utils.compat import LoggerAdapter
 from celery.utils.patch import ensure_process_aware_logger
 from celery.utils.term import colored

+ 1 - 1
celery/pidbox.py

@@ -71,7 +71,7 @@ class BroadcastPublisher(Publisher):
         reply_to = self.ReplyTo(self.connection, None, app=self.app,
                                 auto_declare=False)
         if reply_ticket:
-            arguments["reply_to"] = {"exchange": self.ReplyTo.exchange,
+            arguments["reply_to"] = {"exchange": reply_to.exchange,
                                      "routing_key": reply_ticket}
         super(BroadcastPublisher, self).send({"control": arguments})
 

+ 0 - 2
celery/task/sets.py

@@ -5,8 +5,6 @@ from UserList import UserList
 from celery import registry
 from celery.app import app_or_default
 from celery.datastructures import AttributeDict
-from celery.messaging import TaskPublisher
-from celery.result import TaskSetResult
 from celery.utils import gen_unique_id
 
 TASKSET_DEPRECATION_TEXT = """\

+ 1 - 1
celery/tests/test_bin/test_celeryd.py

@@ -27,7 +27,7 @@ def disable_stdouts(fun):
 
     @wraps(fun)
     def disable(*args, **kwargs):
-        #sys.stdout, sys.stderr = StringIO(), StringIO()
+        sys.stdout, sys.stderr = StringIO(), StringIO()
         try:
             return fun(*args, **kwargs)
         finally:

+ 0 - 3
celery/tests/test_log.py

@@ -1,6 +1,5 @@
 from __future__ import generators
 
-import os
 import sys
 import logging
 import unittest2 as unittest
@@ -12,8 +11,6 @@ try:
 except ImportError:
     from celery.tests.utils import fallback_contextmanager as contextmanager
 
-from carrot.utils import rpartition
-
 from celery import log
 from celery.log import (setup_logger, setup_task_logger,
                         get_default_logger, get_task_logger,

+ 1 - 1
celery/tests/test_task_http.py

@@ -15,7 +15,7 @@ from anyjson import serialize
 from celery.task import http
 from celery.utils.functional import wraps
 
-from celery.tests.utils import eager_tasks, execute_context
+from celery.tests.utils import execute_context
 
 
 @contextmanager

+ 0 - 1
celery/tests/test_worker_job.py

@@ -125,7 +125,6 @@ class test_TaskRequest(unittest.TestCase):
         self.assertIn("task-frobulated", tw.eventer.sent)
 
     def test_send_email(self):
-        from celery.worker import job
         app = app_or_default()
         old_mail_admins = app.mail_admins
         old_enable_mails = mytask.send_error_emails