Merge branch '3.0'

Conflicts:
	Changelog
	celery/apps/worker.py
	celery/bin/celery.py
	celery/task/trace.py
	celery/tests/worker/test_worker.py
	celery/utils/serialization.py
	celery/worker/__init__.py
	celery/worker/buckets.py
	celery/worker/mediator.py
	docs/userguide/tasks.rst
	requirements/default.txt
	setup.cfg

celery/canvas.py

@@ -19,6 +19,7 @@ from itertools import chain as _chain
 from kombu.utils import cached_property, fxrange, kwdict, reprcall, uuid
 
 from celery._state import current_app
+from celery.exceptions import NotRegistered
 from celery.result import AsyncResult, GroupResult
 from celery.utils.functional import (
     maybe_list, is_list, regen,

celery/concurrency/solo.py

@@ -15,6 +15,7 @@ from .base import BasePool, apply_target
 
 class TaskPool(BasePool):
     """Solo task pool (blocking, inline, fast)."""
+    no_threads = True
 
     def __init__(self, *args, **kwargs):
         super(TaskPool, self).__init__(*args, **kwargs)

celery/five.py

@@ -175,7 +175,12 @@ else:  # pragma: no cover
 import operator
 import sys
 
-from functools import reduce
+# import fails in python 2.5. fallback to reduce in stdlib
+try:
+    from functools import reduce
+except ImportError:
+    pass
+
 from importlib import import_module
 from types import ModuleType
 

celery/worker/components.py

@@ -15,7 +15,6 @@ from functools import partial
 from celery import bootsteps
 from celery.exceptions import ImproperlyConfigured
 from celery.five import string_t
-from celery.utils.imports import qualname
 from celery.utils.log import worker_logger as logger
 from celery.utils.timer2 import Schedule
 

docs/history/changelog-3.0.rst

@@ -9,6 +9,62 @@
 
 If you're looking for versions prior to 3.0.x you should go to :ref:`history`.
 
+.. _version-3.0.20:
+
+3.0.20
+======
+:release-date: 2013-06-26 16:00 P.M BST
+
+- Now depends on :ref:`Kombu 2.5.11 <kombu:version-2.5.11>`.
+
+- ``--loader`` argument no longer supported importing loaders from the
+  current directory.
+
+- [Worker] Fixed memory leak when restarting after connection lost
+  (Issue #1325).
+
+- [Worker] Fixed unicode decode error at startup (Issue #1373).
+
+    Fix contributed by Jessica Tallon.
+
+- [Worker] Now properly rewrites unpickleable exceptions again.
+
+- Fixed possible race condition when evicting items from the revoked task set.
+
+- [generic-init.d] Fixed compatibility with Ubuntu's minimal Dash
+  shell (Issue #1387).
+
+    Fix contributed by monkut.
+
+- ``Task.apply``/``ALWAYS_EAGER`` now also executes callbacks and errbacks
+  (Issue #1336).
+
+- [Worker] The :signal:`worker-shutdown` signal was no longer being dispatched
+  (Issue #1339).
+
+- [Python 3] Fixed problem with threading.Event.
+
+    Fix contributed by Xavier Ordoquy.
+
+- [Python 3] Now handles ``io.UnsupportedOperation`` that may be raised
+  by ``file.fileno()`` in Python 3.
+
+- [MongoDB backend] No longer uses deprecated ``safe`` parameter.
+
+    Fix contributed by rfkrocktk
+
+- [Canvas] Fixed regression where immutable chord members may receive
+  arguments (Issue #1340).
+
+    Fix contributed by Peter Brook.
+
+- [Canvas] chain now accepts generator argument again (Issue #1319).
+
+- ``celery.migrate`` command now consumes from all queues if no queues
+  specified.
+
+    Fix contributed by John Watson.
+
 .. _version-3.0.19:
 
 3.0.19

requirements/default.txt

@@ -1,3 +1,3 @@
 pytz
 billiard>=2.7.3.28
-kombu>=2.5.10
+kombu>=2.5.11

setup.cfg

@@ -16,4 +16,4 @@ upload-dir = docs/.build/html
 [bdist_rpm]
 requires = pytz
            billiard >= 2.7.3.28
-           kombu >= 2.5.10
+           kombu >= 2.5.11