openstack/deb-python-websocket-client
Code Issues Proposed changes

Empty strings are probably better here..

Browse Source
This commit is contained in:
Ralph Bean
2014-04-14 16:38:46 -04:00
parent dc84f0b4de
commit be3d283903
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
websocket/__init__.py
View File

@@ -821,10 +821,10 @@ class WebSocket(object):
try: try:
return self.sock.send(data) return self.sock.send(data)
except socket.timeout as e: except socket.timeout as e:
message = getattr(e, 'strerror', getattr(e, 'message', None)) message = getattr(e, 'strerror', getattr(e, 'message', ''))
raise WebSocketTimeoutException(message) raise WebSocketTimeoutException(message)
except Exception as e: except Exception as e:
message = getattr(e, 'strerror', getattr(e, 'message', None)) message = getattr(e, 'strerror', getattr(e, 'message', ''))
if "timed out" in message: if "timed out" in message:
raise WebSocketTimeoutException(message) raise WebSocketTimeoutException(message)
else: else:
@@ -834,10 +834,10 @@ class WebSocket(object):
try: try:
bytes = self.sock.recv(bufsize) bytes = self.sock.recv(bufsize)
except socket.timeout as e: except socket.timeout as e:
message = getattr(e, 'strerror', getattr(e, 'message', None)) message = getattr(e, 'strerror', getattr(e, 'message', ''))
raise WebSocketTimeoutException(message) raise WebSocketTimeoutException(message)
except SSLError as e: except SSLError as e:
message = getattr(e, 'strerror', getattr(e, 'message', None)) message = getattr(e, 'strerror', getattr(e, 'message', ''))
if message == "The read operation timed out": if message == "The read operation timed out":
raise WebSocketTimeoutException(message) raise WebSocketTimeoutException(message)
else: else: