Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 96b3b0b436aa87d9e14720694f55ea235a5873c3 2 parents 7b5551f + 9d0668e
@ask ask authored
Showing with 3 additions and 0 deletions.
  1. +3 −0  kombu/transport/amqplib.py
View
3  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:
Please sign in to comment.
Something went wrong with that request. Please try again.