Merge branch 'master' of github.com:celery/celery

celery/app/task.py

@@ -313,7 +313,7 @@ class Task(object):
     #: :setting:`CELERY_ACKS_LATE` setting.
     acks_late = None
 
-    #: List/tuple of expected exceptions.
+    #: Tuple of expected exceptions.
     #:
     #: These are errors that are expected in normal operation
     #: and that should not be regarded as a real error by the worker.

docs/userguide/tasks.rst

@@ -472,7 +472,7 @@ General
 
 .. attribute:: Task.throws
 
-    Optional list of expected error classes that should not be regarded
+    Optional tuple of expected error classes that should not be regarded
     as an actual error.
 
     Errors in this list will be reported as a failure to the result backend,