jyapayne/socketIO-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge conflicts

Browse source
This commit is contained in:
Roy Hyunjin Han 2015-02-15 15:26:46 -05:00
commit 526a4df25e
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
socketIO_client/__init__.py
View file

@ -312,7 +312,6 @@ class SocketIO(object):
except AttributeError: except AttributeError:
pass pass
warning_screen = _yield_warning_screen(seconds=None) warning_screen = _yield_warning_screen(seconds=None)
for elapsed_time in warning_screen: for elapsed_time in warning_screen:
try: try:
socketIO_session = _get_socketIO_session( socketIO_session = _get_socketIO_session(
@ -327,16 +326,10 @@ class SocketIO(object):
except StopIteration: except StopIteration:
self.log(logging.WARNING, warning) self.log(logging.WARNING, warning)
supported_transports = self._get_supported_transports(socketIO_session) supported_transports = self._get_supported_transports(socketIO_session)
self._heartbeat_interval = socketIO_session.heartbeat_timeout / 2
self.heartbeat_pacemaker = self._make_heartbeat_pacemaker( self.heartbeat_pacemaker = self._make_heartbeat_pacemaker(
heartbeat_interval=self._heartbeat_interval) heartbeat_timeout=socketIO_session.heartbeat_timeout)
next(self.heartbeat_pacemaker) next(self.heartbeat_pacemaker)
for elapsed_time in warning_screen: for elapsed_time in warning_screen:
self.log(
logging.DEBUG,
'[trying transport] %s', supported_transports[0])
try: try:
self.__transport = self._get_transport( self.__transport = self._get_transport(
socketIO_session, supported_transports[0]) socketIO_session, supported_transports[0])
@ -346,7 +339,6 @@ class SocketIO(object):
supported_transports.pop(0) supported_transports.pop(0)
except IndexError: except IndexError:
raise raise
for path, namespace in self._namespace_by_path.items(): for path, namespace in self._namespace_by_path.items():
namespace._transport = self.__transport namespace._transport = self.__transport
self.__transport.connect(path) self.__transport.connect(path)
@ -371,17 +363,19 @@ class SocketIO(object):
return supported_transports return supported_transports
def _get_transport(self, session, transport_name): def _get_transport(self, session, transport_name):
self.log(logging.DEBUG, '[trying transport] %s', transport_name)
return { return {
'websocket': _WebsocketTransport, 'websocket': _WebsocketTransport,
'xhr-polling': _XHR_PollingTransport, 'xhr-polling': _XHR_PollingTransport,
'jsonp-polling': _JSONP_PollingTransport, 'jsonp-polling': _JSONP_PollingTransport,
}[transport_name](session, self.is_secure, self.base_url, **self.kw) }[transport_name](session, self.is_secure, self.base_url, **self.kw)
def _make_heartbeat_pacemaker(self, heartbeat_interval): def _make_heartbeat_pacemaker(self, heartbeat_timeout):
self._heartbeat_interval = heartbeat_timeout / 2
heartbeat_time = time.time() heartbeat_time = time.time()
while True: while True:
yield yield
if time.time() - heartbeat_time > heartbeat_interval: if time.time() - heartbeat_time > self._heartbeat_interval:
heartbeat_time = time.time() heartbeat_time = time.time()
self._transport.send_heartbeat() self._transport.send_heartbeat()