Pyflakes

celery/bin/celerybeat.py

@@ -19,15 +19,14 @@
 
 """
 import sys
-import traceback
 import optparse
+import traceback
 
+import celery
 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.utils import noop
 from celery.utils import info
 
 STARTUP_INFO_FMT = """
@@ -59,7 +58,7 @@ def run_clockservice(loglevel=conf.CELERYBEAT_LOG_LEVEL,
         schedule=conf.CELERYBEAT_SCHEDULE_FILENAME, **kwargs):
     """Starts the celerybeat clock server."""
 
-    print("celerybeat %s is starting." % __version__)
+    print("celerybeat %s is starting." % celery.__version__)
 
     # Setup logging
     if not isinstance(loglevel, int):
@@ -85,9 +84,9 @@ def run_clockservice(loglevel=conf.CELERYBEAT_LOG_LEVEL,
     arg_start = "manage" in sys.argv[0] and 2 or 1
     platform.set_process_title("celerybeat",
                                info=" ".join(sys.argv[arg_start:]))
-    from celery.log import setup_logger, redirect_stdouts_to_logger
 
     def _run_clock():
+        from celery.log import setup_logger
         logger = setup_logger(loglevel, logfile)
         clockservice = ClockService(logger=logger, schedule_filename=schedule)
 

celery/bin/celeryd.py

@@ -40,12 +40,11 @@ import optparse
 import traceback
 import multiprocessing
 
+import celery
 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.utils import noop
 from celery.utils import info
 from celery.worker import WorkController
 
@@ -95,7 +94,7 @@ def run_worker(concurrency=conf.CELERYD_CONCURRENCY,
         discard=False, run_clockservice=False, events=False, **kwargs):
     """Starts the celery worker server."""
 
-    print("Celery %s is starting." % __version__)
+    print("Celery %s is starting." % celery.__version__)
 
     from celery.loaders import current_loader, load_settings
     loader = current_loader()

celery/datastructures.py

@@ -3,7 +3,6 @@
 Custom Datastructures
 
 """
-import sys
 import time
 import traceback
 from UserList import UserList

celery/platform.py

@@ -5,9 +5,6 @@ except ImportError:
     _setproctitle = None
 
 
-from celery.utils import noop
-
-
 def reset_signal(signal_name):
     """Reset signal to the default signal handler.
 

celery/utils/patch.py

@@ -1,5 +1,4 @@
 import logging
-import sys
 
 
 def _check_logger_class():