Merge pull request #57 from jorgen-k/master

Fix SSL timeout error thansk to jorgen-k

setup.py

@@ -9,7 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 
 setup(
     name='socketIO-client',
-    version='0.5.3',
+    version='0.5.3.2',
     description='A socket.io client library',
     long_description=README + '\n\n' + CHANGES,
     license='MIT',

socketIO_client/__init__.py

@@ -170,7 +170,6 @@ class SocketIO(object):
 
         - Omit seconds, i.e. call wait() without arguments, to wait forever.
         """
-        try:
         warning_screen = _yield_warning_screen(seconds)
         for elapsed_time in warning_screen:
             try:
@@ -188,8 +187,6 @@ class SocketIO(object):
                 except StopIteration:
                     _log.warn(warning)
                 self.disconnect()
-        except KeyboardInterrupt:
-            pass
 
     def _process_events(self):
         for packet in self._transport.recv_packet():

socketIO_client/transports.py

@@ -150,6 +150,9 @@ class _WebsocketTransport(_AbstractTransport):
         except websocket.WebSocketTimeoutException as e:
             raise TimeoutError(e)
         except websocket.SSLError as e:
+            if e.message == "The read operation timed out":
+                raise TimeoutError(e)
+            else:
                 raise ConnectionError(e)
         except websocket.WebSocketConnectionClosedException as e:
             raise ConnectionError('connection closed (%s)' % e)