Merge branch '3.0'

celery/concurrency/eventlet.py

@@ -9,20 +9,23 @@
 from __future__ import absolute_import
 
 import os
+import sys
 
 EVENTLET_NOPATCH = os.environ.get('EVENTLET_NOPATCH', False)
 EVENTLET_DBLOCK = int(os.environ.get('EVENTLET_NOBLOCK', 0))
 W_RACE = """\
 Celery module with %s imported before eventlet patched\
 """
+RACE_MODS = ('billiard.', 'celery.', 'kombu.')
 
-def _racedetect():
-    import sys
-    for mod in (mod for mod in sys.modules if mod.startswith('celery.')):
-            for side in ('thread', 'threading', 'socket'):
-                if getattr(mod, side, None):
-                    warnings.warn(RuntimeWarning(W_RACE % side))
-_racedetect()
+
+#: Warn if we couldn't patch early enough,
+#: and thread/socket depending celery modules have already been loaded.
+for mod in (mod for mod in sys.modules if mod.startswith(RACE_MODS)):
+    for side in ('thread', 'threading', 'socket'):
+        if getattr(mod, side, None):
+            import warnings
+            warnings.warn(RuntimeWarning(W_RACE % side))
 
 
 PATCHED = [0]

celery/tests/concurrency/test_processes.py

@@ -1,11 +1,10 @@
 from __future__ import absolute_import
 
-import signal
 import time
 
 from itertools import cycle
 
-from mock import Mock, patch
+from mock import Mock
 from nose import SkipTest
 
 from celery.utils.functional import noop

docs/userguide/monitoring.rst

@@ -23,8 +23,8 @@ Workers
 .. _monitoring-celeryctl:
 
 
-``celery``: Management Command-line Utility
--------------------------------------------
+``celery``: Management Command-line Utilities
+---------------------------------------------
 
 .. versionadded:: 2.1