Merge branch 'leobantech/master'

.gitignore

@@ -17,3 +17,6 @@ erl_crash.dump
 Documentation/
 .tox/
 .ropeproject/
+.project
+.pydevproject
+

FAQ

@@ -159,6 +159,14 @@ celeryd is not doing anything, just hanging
 **Answer:** See `MySQL is throwing deadlock errors, what can I do?`_.
             or `Why is Task.delay/apply\* just hanging?`.
 
+.. _faq-results-unreliable:
+
+Task results aren't reliably returning
+--------------------------------------
+
+**Answer:** If you're using the database backend for results, and in particular
+using MySQL, see `MySQL is throwing deadlock errors, what can I do?`_.
+
 .. _faq-publish-hanging:
 
 Why is Task.delay/apply\*/celeryd just hanging?

celery/worker/consumer.py

@@ -391,7 +391,7 @@ class Consumer(object):
                     "Couldn't ack %r: body:%r reason:%r" % (
                         message.delivery_tag, safe_repr(body), exc))
 
-        if not body.get("task"):
+        if not isinstance(body,dict) or not body.get("task"):
             warnings.warn(RuntimeWarning(
                 "Received and deleted unknown message. Wrong destination?!? \
                 the full contents of the message body was: %s" % (

setup.py

@@ -56,7 +56,7 @@ install_requires.extend([
 if is_py3k:
     install_requires.append("python-dateutil>2.0.0")
 else:
-    install_requires.append("python-dateutil>1.5.0,<2.0.0")
+    install_requires.append("python-dateutil>=1.5.0,<2.0.0")
 
 py_version = sys.version_info
 is_jython = sys.platform.startswith("java")