Merge pull request #536 from trygveaa:dont-retry-sockets-with-timeout-0

Don't retry sockets with timeout set to 0

2 files changed, 11 insertions, 2 deletions

diff --git a/websocket/_socket.py b/websocket/_socket.py
index d811c21..7be3913 100644
--- a/websocket/_socket.py
+++ b/websocket/_socket.py
@@ -96,7 +96,10 @@ def recv(sock, bufsize):
             return sock.recv(bufsize)
 
     try:
-        bytes_ = _recv()
+        if sock.gettimeout() == 0:
+            bytes_ = sock.recv(bufsize)
+        else:
+            bytes_ = _recv()
     except socket.timeout as e:
         message = extract_err_message(e)
         raise WebSocketTimeoutException(message)
@@ -148,7 +151,10 @@ def send(sock, data):
             return sock.send(data)
 
     try:
-        return _send()
+        if sock.gettimeout() == 0:
+            return sock.send(data)
+        else:
+            return _send()
     except socket.timeout as e:
         message = extract_err_message(e)
         raise WebSocketTimeoutException(message)
diff --git a/websocket/tests/test_websocket.py b/websocket/tests/test_websocket.py
index f49a893..8b131bb 100644
--- a/websocket/tests/test_websocket.py
+++ b/websocket/tests/test_websocket.py
@@ -55,6 +55,9 @@ class SockMock(object):
     def add_packet(self, data):
         self.data.append(data)
 
+    def gettimeout(self):
+        return None
+
     def recv(self, bufsize):
         if self.data:
             e = self.data.pop(0)