This commit is contained in:
Roy Hyunjin Han 2015-02-19 09:17:22 -05:00
commit b70cb7ffe5
2 changed files with 3 additions and 4 deletions

View file

@ -3,9 +3,6 @@ python:
- 2.6 - 2.6
- 2.7 - 2.7
- 3.4 - 3.4
matrix:
allow_failures:
- python: 3.4
before_install: before_install:
- sudo apt-get update - sudo apt-get update
- sudo apt-get install nodejs - sudo apt-get install nodejs

View file

@ -7,7 +7,7 @@ import six
import socket import socket
import sys import sys
import time import time
import websocket import websocket._exceptions
from .exceptions import ConnectionError, TimeoutError from .exceptions import ConnectionError, TimeoutError
@ -148,6 +148,8 @@ class _WebsocketTransport(_AbstractTransport):
raise ConnectionError(e) raise ConnectionError(e)
except socket.error as e: except socket.error as e:
raise ConnectionError(e) raise ConnectionError(e)
except websocket._exceptions.WebSocketException as e:
raise ConnectionError(e)
self._connection.settimeout(TIMEOUT_IN_SECONDS) self._connection.settimeout(TIMEOUT_IN_SECONDS)
@property @property