Merge branch 'master' into release23-maint

Changelog

@@ -9,8 +9,7 @@
 
 2.3.0
 =====
-:release-date: TBA
-
+:release-date: 2011-08-05 12:00 P.M BST
 :tested: cPython: 2.5, 2.6, 2.7; PyPy: 1.5; Jython: 2.5.2
 
 .. _v230-important:
@@ -355,7 +354,7 @@ News
     * ``eventlet_pool_postshutdown``
     * ``eventlet_pool_apply``
 
-    See :ref:`signals` for more information.
+    See :mod:`celery.signals` for more information.
 
 * New :setting:`BROKER_TRANSPORT_OPTIONS` setting can be used to pass
   additional arguments to a particular broker transport.

celery/backends/base.py

@@ -220,10 +220,9 @@ def get_result(self, task_id):
     def get_task_meta(self, task_id, cache=True):
         if cache and task_id in self._cache:
             try:
-              return self._cache[task_id]
+                return self._cache[task_id]
             except KeyError:
-              #The Backend has been emptied in the meantime
-              pass
+                pass   # backend emptied in the meantime
 
         meta = self._get_task_meta_for(task_id)
         if cache and meta.get("status") == states.SUCCESS:
@@ -240,10 +239,9 @@ def reload_taskset_result(self, taskset_id):
     def get_taskset_meta(self, taskset_id, cache=True):
         if cache and taskset_id in self._cache:
             try:
-              return self._cache[taskset_id]
+                return self._cache[taskset_id]
             except KeyError:
-              #The Backend has been emptied in the meantime
-              pass
+                pass  # backend emptied in the meantime
 
         meta = self._restore_taskset(taskset_id)
         if cache and meta is not None:

celery/beat.py

@@ -87,6 +87,7 @@ def next(self, last_run_at=None):
         return self.__class__(**dict(self,
                                      last_run_at=last_run_at or datetime.now(),
                                      total_run_count=self.total_run_count + 1))
+    __next__ = next  # for 2to3
 
     def update(self, other):
         """Update values from another entry.

celery/datastructures.py

@@ -311,7 +311,7 @@ def __setitem__(self, key, value):
 
     def pop(self, key, *args):
         with self.lock:
-            self.pop(key, *args)
+            super(LocalCache, self).pop(key, *args)
 
 
 class TokenBucket(object):

celery/tests/test_app/test_loaders.py

@@ -103,8 +103,8 @@ def test_conf_property(self):
         self.assertEqual(self.loader.conf["foo"], "bar")
 
     def test_import_default_modules(self):
-        self.assertItemsEqual(self.loader.import_default_modules(),
-                              [os, sys, task])
+        self.assertEqual(sorted(self.loader.import_default_modules()),
+                         sorted([os, sys, task]))
 
     def test_import_from_cwd_custom_imp(self):
 

celery/tests/test_backends/test_amqp.py

@@ -225,10 +225,10 @@ def test_get_many(self):
                                     "traceback": None,
                                     "task_id": uuid})
                                 for i, uuid in enumerate(uuids)]
-        self.assertItemsEqual(res, expected_results)
+        self.assertEqual(sorted(res), sorted(expected_results))
         self.assertDictEqual(b._cache[res[0][0]], res[0][1])
         cached_res = list(b.get_many(uuids, timeout=1))
-        self.assertItemsEqual(cached_res, expected_results)
+        self.assertEqual(sorted(cached_res), sorted(expected_results))
         b._cache[res[0][0]]["status"] = states.RETRY
         self.assertRaises(socket.timeout, list,
                           b.get_many(uuids, timeout=0.01))

celery/tests/test_events/test_events_state.py

@@ -105,14 +105,14 @@ def test_info(self):
                     received=time() - 10,
                     started=time() - 8,
                     succeeded=time())
-        self.assertItemsEqual(list(task._info_fields),
-                              task.info().keys())
+        self.assertEqual(sorted(list(task._info_fields)),
+                              sorted(task.info().keys()))
 
-        self.assertItemsEqual(list(task._info_fields + ("received", )),
-                              task.info(extra=("received", )))
+        self.assertEqual(sorted(list(task._info_fields + ("received", ))),
+                              sorted(task.info(extra=("received", ))))
 
-        self.assertItemsEqual(["args", "kwargs"],
-                              task.info(["args", "kwargs"]).keys())
+        self.assertEqual(sorted(["args", "kwargs"]),
+                         sorted(task.info(["args", "kwargs"]).keys()))
 
     def test_ready(self):
         task = Task(uuid="abcdefg",
@@ -278,7 +278,7 @@ def test_clear(self):
     def test_task_types(self):
         r = ev_snapshot(State())
         r.play()
-        self.assertItemsEqual(r.state.task_types(), ["task1", "task2"])
+        self.assertEqual(sorted(r.state.task_types()), ["task1", "task2"])
 
     def test_tasks_by_timestamp(self):
         r = ev_snapshot(State())

celery/tests/test_slow/test_buckets.py

@@ -278,7 +278,7 @@ def test_items(self):
         x.buckets[TaskA.name].put(1)
         x.buckets[TaskB.name].put(2)
         x.buckets[TaskC.name].put(3)
-        self.assertItemsEqual(x.items, [1, 2, 3])
+        self.assertEqual(sorted(x.items), [1, 2, 3])
 
 
 class test_FastQueue(unittest.TestCase):

celery/tests/test_utils/test_utils_info.py

@@ -39,5 +39,5 @@ def test_textindent(self):
     def test_format_queues(self):
         celery = Celery(set_as_current=False)
         celery.amqp.queues = celery.amqp.Queues(QUEUES)
-        self.assertItemsEqual(celery.amqp.queues.format().split("\n"),
-                              [QUEUE_FORMAT1, QUEUE_FORMAT2])
+        self.assertEqual(sorted(celery.amqp.queues.format().split("\n")),
+                         sorted([QUEUE_FORMAT1, QUEUE_FORMAT2]))

celery/tests/test_worker/test_worker.py

@@ -27,7 +27,7 @@
 
 from celery.tests.compat import catch_warnings
 from celery.tests.utils import unittest
-from celery.tests.utils import AppCase, skip
+from celery.tests.utils import AppCase
 
 
 class PlaceHolder(object):

celery/tests/test_worker/test_worker_control.py

@@ -216,8 +216,8 @@ def test_revoked(self):
         state.revoked.add("a2")
 
         try:
-            self.assertItemsEqual(self.panel.handle("dump_revoked"),
-                                  ["a1", "a2"])
+            self.assertEqual(sorted(self.panel.handle("dump_revoked")),
+                             ["a1", "a2"])
         finally:
             state.revoked.clear()
 

celery/utils/compat.py

@@ -21,7 +21,7 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    from ordereddict import OrderedDict
+    from ordereddict import OrderedDict  # noqa
 
 ############## logging.LoggerAdapter ########################################
 import logging

celery/utils/timer2.py

@@ -173,6 +173,7 @@ def next(self):
                     self.not_empty.wait(1.0)
                 return delay
         return self.apply_entry(entry)
+    __next__ = next  # for 2to3
 
     def run(self):
         try:

docs/cookbook/daemonizing.rst

@@ -262,3 +262,13 @@ launchd (OS X)
 
 .. _`contrib/mac/`:
     http://github.com/ask/celery/tree/master/contrib/mac/
+
+
+.. _daemon-windows:
+
+Windows
+=======
+
+See this excellent external tutorial:
+
+http://www.calazan.com/windows-tip-run-applications-in-the-background-using-task-scheduler/