Merge branch '3.0'

CONTRIBUTORS.txt

@@ -113,4 +113,5 @@ Jared Biel, 2012/07/05
 Jed Smith, 2012/07/08
 Łukasz Langa, 2012/07/10
 Rinat Shigapov, 2012/07/20
-Hynek Schlawack, 2012/07/23
+Hynek Schlawack, 2012/07/23
+Paul McMillan, 2012/07/26

celery/worker/consumer.py

@@ -440,7 +440,11 @@ class Consumer(object):
                 if readers or writers:
                     connection.more_to_read = True
                     while connection.more_to_read:
-                        for fileno, event in poll(poll_timeout) or ():
+                        try:
+                            events = poll(poll_timeout)
+                        except ValueError:  # Issue 882
+                            return
+                        for fileno, event in events or ():
                             try:
                                 if event & READ:
                                     readers[fileno](fileno, event)

docs/userguide/monitoring.rst

@@ -113,12 +113,12 @@ Commands
 
         $ celery inspect stats
 
-* **inspect enable_events**: Enable events
+* **control enable_events**: Enable events
     ::
 
-        $ celery inspect enable_events
+        $ celery control enable_events
 
-* **inspect disable_events**: Disable events
+* **control disable_events**: Disable events
     ::
 
         $ celery inspect disable_events
@@ -222,7 +222,7 @@ To start the camera run::
 
 If you haven't already enabled the sending of events you need to do so::
 
-    $ python manage.py celery inspect enable_events
+    $ python manage.py celery control enable_events
 
 :Tip: You can enable events when the worker starts using the `-E` argument.