Removes maybe_block

celery/backends/base.py

@@ -19,7 +19,6 @@ import sys
 from datetime import timedelta
 
 from billiard.einfo import ExceptionInfo
-from kombu.async import maybe_block
 from kombu.serialization import (
     dumps, loads, prepare_accept_content,
     registry as serializer_registry,
@@ -199,9 +198,8 @@ class BaseBackend(object):
     def store_result(self, task_id, result, status, traceback=None, **kwargs):
         """Update task state and result."""
         result = self.encode_result(result, status)
-        with maybe_block():
-            self._store_result(task_id, result, status, traceback, **kwargs)
-            return result
+        self._store_result(task_id, result, status, traceback, **kwargs)
+        return result
 
     def forget(self, task_id):
         self._cache.pop(task_id, None)

celery/utils/mail.py

@@ -15,8 +15,6 @@ import warnings
 
 from email.mime.text import MIMEText
 
-from kombu.async import maybe_block
-
 from .functional import maybe_list
 
 try:
@@ -187,7 +185,6 @@ py-celery at {{hostname}}.
 
     def send(self, context, exc, fail_silently=True):
         if self.should_send(context, exc):
-            with maybe_block():
-                self.task.app.mail_admins(self.format_subject(context),
-                                          self.format_body(context),
-                                          fail_silently=fail_silently)
+            self.task.app.mail_admins(self.format_subject(context),
+                                      self.format_body(context),
+                                      fail_silently=fail_silently)

celery/worker/pidbox.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import
 import socket
 import threading
 
-from kombu.async import maybe_block
 from kombu.common import ignore_errors
 from kombu.utils.encoding import safe_str
 
@@ -35,8 +34,7 @@ class Pidbox(object):
         self._forward_clock()  # just increase clock as clients usually don't
                                # have a valid clock to adjust with.
         try:
-            with maybe_block():
-                self.node.handle_message(body, message)
+            self.node.handle_message(body, message)
         except KeyError as exc:
             error('No such control command: %s', exc)
         except Exception as exc: