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

celery · Oct 12, 2012 · 96b3b0b · 96b3b0b
2 parents 7b5551f + 9d0668e
commit 96b3b0b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/kombu/transport/amqplib.py b/kombu/transport/amqplib.py
@@ -195,6 +195,9 @@ def read_timeout(self, timeout=None):
                 # http://bugs.python.org/issue10272
                 if 'timed out' in str(exc):
                     raise socket.timeout()
+                # Non-blocking SSL sockets can throw SSLError
+                if 'The operation did not complete' in str(exc):
+                    raise socket.timeout()
                 raise
         finally:
             if prev != timeout: